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

FIRE-15138: Sharing inventory item sometimes doesn't obey UseLegacyIMLogNames setting

meow-7.2.2
Ansariel 2016-04-15 16:05:57 +02:00
parent f3d970a5a7
commit c7cf6ed618
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
indra/newview/llimview.cpp
View File

@ -3192,6 +3192,25 @@ void LLIMMgr::addMessage(
}
}
// <FS:Ansariel> FIRE-15138: Sharing inventory item sometimes doesn't obey UseLegacyIMLogNames setting
void add_system_message_name_cb(LLAvatarName avatar_name, const std::string& message)
{
std::string session_name = avatar_name.getLegacyName();
// <FS:Ansariel> [Legacy IM logfile names]
if (gSavedSettings.getBOOL("UseLegacyIMLogNames"))
{
session_name = session_name.substr(0, session_name.find(" Resident"));;
}
else
{
session_name = LLCacheName::buildUsername(session_name);
}
// </FS:Ansariel> [Legacy IM logfile names]
LLIMModel::instance().logToFile(session_name, SYSTEM_FROM, LLUUID::null, message);
}
// </FS:Ansariel>
void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args)
{
LLUIString message;
@ -3226,21 +3245,14 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess
else
{
std::string session_name;
// since we select user to share item with - his name is already in cache
gCacheName->getFullName(args["user_id"], session_name);
// <FS:Ansariel> [Legacy IM logfile names]
// <FS:Ansariel> FIRE-15138: Sharing inventory item sometimes doesn't obey UseLegacyIMLogNames setting
//std::string session_name;
//// since we select user to share item with - his name is already in cache
//gCacheName->getFullName(args["user_id"], session_name);
//session_name = LLCacheName::buildUsername(session_name);
if (gSavedSettings.getBOOL("UseLegacyIMLogNames"))
{
session_name = session_name.substr(0, session_name.find(" Resident"));;
}
else
{
session_name = LLCacheName::buildUsername(session_name);
}
// </FS:Ansariel> [Legacy IM logfile names]
LLIMModel::instance().logToFile(session_name, SYSTEM_FROM, LLUUID::null, message.getString());
//LLIMModel::instance().logToFile(session_name, SYSTEM_FROM, LLUUID::null, message.getString());
LLAvatarNameCache::get(args["user_id"].asUUID(), boost::bind(&add_system_message_name_cb, _2, message.getString()));
// </FS:Ansariel>
}
}
}