diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-05 15:38:45 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-05 15:38:45 -0700 |
| commit | 7c47576f02e2e5f1300e786b8868a0697554f69a (patch) | |
| tree | 163d80041259945a4e63781f3756a1007003f53e /indra/newview | |
| parent | 8ce02aeef0c170b87ddb570b97eddd0c0dd13184 (diff) | |
DN-130 As a resident I want to show usernames in local chat if username preference is set so that I can follow the conversation when people are changing their display name
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 162c846202..f28e02c66e 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -55,6 +55,7 @@ #include "llworld.h" #include "lluiconstants.h" +#include "llviewercontrol.h" #include "llsidetray.h"//for blocked objects panel @@ -365,6 +366,17 @@ public: LLTextBox* user_name = getChild<LLTextBox>("user_name"); user_name->setValue( LLSD(av_name.mDisplayName ) ); user_name->setToolTip( av_name.mUsername ); + + if (gSavedSettings.getBOOL("NameTagShowUsernames")) + { + LLStyle::Params style_params_name; + LLColor4 userNameColor = LLUIColorTable::instance().getColor("EmphasisColor"); + style_params_name.color(userNameColor); + style_params_name.font.name("SansSerifSmall"); + style_params_name.font.style("NORMAL"); + style_params_name.readonly_color(userNameColor); + user_name->appendText(" - " + av_name.mUsername, FALSE, style_params_name); + } setToolTip( av_name.mUsername ); // name might have changed, update width updateMinUserNameWidth(); |