Skip to content

Fix owner name SLURLs in inventory offers #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyeMutt merged 1 commit into from
Aug 27, 2026
Merged

Fix owner name SLURLs in inventory offers #371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions indra/newview/llviewermessage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1654,6 +1654,11 @@ void LLOfferInfo::handleRespond(const LLSD& notification, const LLSD& response)
mRespondFunctions[name](notification, response);
}

static std::string no_link(const std::string& text)
{
return "<nolink>" + text + "</nolink>";
}

bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD& response)
{
LLChat chat;
Expand Down Expand Up @@ -1767,7 +1772,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
//don't spam them if they are getting flooded
if (check_offer_throttle(mFromName, true))
{
log_message = "<nolink>" + chatHistory_string + "</nolink> " + LLTrans::getString("InvOfferGaveYou") + " " + getSanitizedDescription() + LLTrans::getString(".");
log_message = no_link(chatHistory_string) + " " + LLTrans::getString("InvOfferGaveYou") + " " + getSanitizedDescription() + LLTrans::getString(".");
LLSD args;
args["MESSAGE"] = log_message;
LLNotificationsUtil::add("SystemMessageTip", args);
Expand Down Expand Up @@ -1900,16 +1905,16 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
quot + mFromName + quot + " " +
LLTrans::getString("InvOfferOwnedByGroup") + " " +
quot + group_name + quot;
chatHistory_string = mFromName + " " +
chatHistory_string = no_link(mFromName) + " " +
LLTrans::getString("InvOfferOwnedByGroup") + " " +
quot + group_name + quot;
quot + no_link(group_name) + quot;
}
else
{
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " +
quot + mFromName + quot + " " +
LLTrans::getString("InvOfferOwnedByUnknownGroup");
chatHistory_string = mFromName + " " +
chatHistory_string = no_link(mFromName) + " " +
LLTrans::getString("InvOfferOwnedByUnknownGroup");
}
}
Expand Down Expand Up @@ -1948,13 +1953,14 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const

from_string = LLTrans::getString("InvOfferAnObjectNamed") + " "+ LLTrans::getString("'") + mFromName
+ LLTrans::getString("'")+" " + LLTrans::getString("InvOfferOwnedBy") + name_slurl;
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedBy") + " " + name_slurl;
chatHistory_string = no_link(mFromName) + " " + LLTrans::getString("InvOfferOwnedBy") + " " + name_slurl;
// [/SL:KB]
}
}
else
{
from_string = chatHistory_string = mFromName;
from_string = mFromName;
chatHistory_string = no_link(mFromName);
}

LLUUID destination;
Expand Down Expand Up @@ -1996,7 +2002,7 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
//don't spam user if flooded
if (check_offer_throttle(mFromName, true))
{
log_message = "<nolink>" + chatHistory_string + "</nolink> " + LLTrans::getString("InvOfferGaveYou") + " " + getSanitizedDescription() + LLTrans::getString(".");
log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + getSanitizedDescription() + LLTrans::getString(".");
LLSD args;
args["MESSAGE"] = log_message;
LLNotificationsUtil::add("SystemMessageTip", args);
Expand Down
Loading