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

FIRE-21298: Emotes ignoring display name setting if using V5 style chat history

meow-7.2.2
Ansariel 2017-06-23 15:55:03 +02:00
parent 42ea72063d
commit e8a24001aa
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llurlentry.cpp
View File

@ -897,7 +897,9 @@ LLUrlEntryAgentDisplayName::LLUrlEntryAgentDisplayName()
std::string LLUrlEntryAgentDisplayName::getName(const LLAvatarName& avatar_name)
{
return avatar_name.getDisplayName(true);
// <FS:Ansariel> Don't force a display name if display names are disabled
//return avatar_name.getDisplayName(true);
return avatar_name.getDisplayName();
}
//

5
indra/newview/fschathistory.cpp
View File

@ -1334,7 +1334,10 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
{
if (chat.mSourceType == CHAT_SOURCE_AGENT)
{
std::string name_format = "completename";
static LLCachedControl<bool> useDisplayNames(gSavedSettings, "UseDisplayNames");
static LLCachedControl<bool> nameTagShowUsernames(gSavedSettings, "NameTagShowUsernames");
std::string name_format = (useDisplayNames && nameTagShowUsernames) ? "completename" : "displayname";
if (is_local && gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
{
name_format = "rlvanonym";