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

FIRE-21321: People panel ignores FSUseBuiltInHistory setting

master
Ansariel 2017-06-27 21:24:22 +02:00
parent f513e7b352
commit aa13de30ad
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llavataractions.cpp
View File

@ -1376,6 +1376,7 @@ void LLAvatarActions::viewChatHistory(const LLUUID& id)
extended_id[LL_FCP_COMPLETE_NAME] = avatar_name.getCompleteName();
// <FS:Ansariel> [Legacy IM logfile names]
//extended_id[LL_FCP_ACCOUNT_NAME] = avatar_name.getAccountName();
//LLFloaterReg::showInstance("preview_conversation", extended_id, true);
if (gSavedSettings.getBOOL("UseLegacyIMLogNames"))
{
std::string avatar_user_name = avatar_name.getUserName();
@ -1385,8 +1386,16 @@ void LLAvatarActions::viewChatHistory(const LLUUID& id)
{
extended_id[LL_FCP_ACCOUNT_NAME] = avatar_name.getAccountName();
}
if (gSavedSettings.getBOOL("FSUseBuiltInHistory"))
{
LLFloaterReg::showInstance("preview_conversation", extended_id, TRUE);
}
else
{
gViewerWindow->getWindow()->openFile(LLLogChat::makeLogFileName(extended_id[LL_FCP_ACCOUNT_NAME].asString()));
}
// </FS:Ansariel> [Legacy IM logfile names]
LLFloaterReg::showInstance("preview_conversation", extended_id, true);
}
}