From cbc9fcabf945558ef22d35e2957ae9f1c879ef7b Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 19 May 2010 09:38:49 -0700
Subject: [PATCH] DEV-50013 More SLID to Username renames
---
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/llfloaterpreference.cpp | 2 +-
indra/newview/llvoavatar.cpp | 10 +++++-----
.../skins/default/xui/en/panel_preferences_general.xml | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6a68f72bb5..6e7d851072 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7337,7 +7337,7 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>NameTagShowSLIDs</key>
+ <key>NameTagShowUsernames</key>
<map>
<key>Comment</key>
<string>Show usernames in avatar name tags</string>
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index f248fde64a..a7e5eedf5f 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -326,7 +326,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
sSkin = gSavedSettings.getString("SkinCurrent");
- gSavedSettings.getControl("NameTagShowSLIDs")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2));
+ gSavedSettings.getControl("NameTagShowUsernames")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2));
gSavedSettings.getControl("UseDisplayNames")->getCommitSignal()->connect(boost::bind(&handleDisplayNamesOptionChanged, _2));
}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index e7721d6068..40e1f31697 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2856,7 +2856,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
}
static LLUICachedControl<bool> show_display_names("NameTagShowDisplayNames");
- static LLUICachedControl<bool> show_slids("NameTagShowSLIDs");
+ static LLUICachedControl<bool> show_usernames("NameTagShowUsernames");
if (LLAvatarNameCache::useDisplayNames())
{
@@ -2876,11 +2876,11 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
LLFontGL::getFontSansSerif());
}
// Suppress SLID display if display name matches exactly (ugh)
- if (show_slids && !av_name.mIsDisplayNameDefault)
+ if (show_usernames && !av_name.mIsDisplayNameDefault)
{
- // JAMESDEBUG HACK
- LLColor4 slid_color = name_tag_color * 0.83f;
- addNameTagLine(av_name.mUsername, slid_color, LLFontGL::NORMAL,
+ // *HACK: Desaturate the color
+ LLColor4 username_color = name_tag_color * 0.83f;
+ addNameTagLine(av_name.mUsername, username_color, LLFontGL::NORMAL,
LLFontGL::getFontSansSerifSmall());
}
}
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index b09ac4d0fa..5f50b962ee 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -287,7 +287,7 @@
top_pad="5" />
-->
<check_box
- control_name="NameTagShowSLIDs"
+ control_name="NameTagShowUsernames"
enabled_control="AvatarNameTagMode"
height="16"
label="Usernames"
--
GitLab