summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llfloaterpreference.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml1
2 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index b4f9176f9a..c197c78a41 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -233,10 +233,6 @@ void handleNameTagOptionChanged(const LLSD& newvalue)
{
gSavedSettings.setBOOL("SmallAvatarNames", TRUE);
}
- else
- {
- gSavedSettings.setBOOL("SmallAvatarNames", FALSE);
- }
}
bool callback_skip_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater)
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 f6074805c7..a94cfbeec4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -275,6 +275,7 @@
top_pad="5"
width="300" />
<check_box
+ enabled_control="AvatarNameTagMode"
control_name="SmallAvatarNames"
height="16"
initial_value="true"