From 760adead96e62cab8f9cdacc6469773a87dfbc1a Mon Sep 17 00:00:00 2001
From: Jiao Li <angela@lindenlab.com>
Date: Tue, 22 Sep 2009 04:30:11 +0000
Subject: [PATCH] EXT-1006 Name Tag options not remembered in the Preferences
window -- to be reviewed
---
indra/newview/llfloaterpreference.cpp | 4 ----
.../skins/default/xui/en/panel_preferences_general.xml | 1 +
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index b4f9176f9a3..c197c78a415 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 f6074805c73..a94cfbeec46 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"
--
GitLab