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
parent
8ce02aeef0
commit
7c47576f02
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue