livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-29677 / SL-13720: Work around broken IM_GROUP_NOTICE_REQUESTED instant message type until this might get fixed by LL at some point - maybe...

master
Ansariel 2020-10-25 23:41:41 +01:00
parent 9f9ae52e8f
commit 2ee77678a7
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llimprocessing.cpp
View File

@ -1194,6 +1194,15 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
LLStringUtil::format_map_t args;
args["NAME"] = name;
from_name += LLTrans::getString("InvOfferGroupNoticeName", args);
// <FS:Ansariel> FIRE-29677 / SL-13720 workaround
if (LLUUID::validate(name))
{
LLStringUtil::format_map_t args;
args["NAME"] = "%s";
std::string placeholder_from_name = LLTrans::getString("InvOfferGroupNoticeName", args);
from_name = name + "|" + placeholder_from_name;
}
// </FS:Ansariel>
info->mFromName = from_name;

33
indra/newview/llviewermessage.cpp
View File

@ -1964,6 +1964,13 @@ void LLOfferInfo::handleRespond(const LLSD& notification, const LLSD& response)
mRespondFunctions[name](notification, response);
}
void inventory_offer_name_callback(const LLAvatarName& av_name, std::string message)
{
LLSD args;
args["MESSAGE"] = llformat(message.c_str(), av_name.getUserName().c_str());
LLNotificationsUtil::add("SystemMessageTip", args);
}
bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD& response)
{
LLChat chat;
@ -2096,11 +2103,29 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
{
// <FS:Ansariel> This breaks object owner name parsing
//log_message = "<nolink>" + chatHistory_string + "</nolink> " + LLTrans::getString("InvOfferGaveYou") + " " + getSanitizedDescription() + LLTrans::getString(".");
log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + getSanitizedDescription() + LLTrans::getString(".");
// <FS:Ansariel> FIRE-29677 / SL-13720 workaround
//log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + getSanitizedDescription() + LLTrans::getString(".");
// </FS:Ansariel>
//LLSD args;
//args["MESSAGE"] = log_message;
//LLNotificationsUtil::add("SystemMessageTip", args);
log_message = " " + LLTrans::getString("InvOfferGaveYou") + " " + getSanitizedDescription() + LLTrans::getString(".");
LLUUID inv_sender_id;
size_t separator_idx = mFromName.find('|');
if (separator_idx != std::string::npos && LLUUID::parseUUID(mFromName.substr(0, separator_idx), &inv_sender_id) && mFromName.size() > (++separator_idx))
{
log_message = mFromName.substr(separator_idx) + log_message;
LLAvatarNameCache::instance().get(inv_sender_id, boost::bind(&inventory_offer_name_callback, _2, log_message));
}
else
{
LLSD args;
args["MESSAGE"] = chatHistory_string + log_message;
LLNotificationsUtil::add("SystemMessageTip", args);
}
// </FS:Ansariel>
LLSD args;
args["MESSAGE"] = log_message;
LLNotificationsUtil::add("SystemMessageTip", args);
}
// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers