diff options
| author | Jiao Li <angela@lindenlab.com> | 2009-09-22 04:30:11 +0000 |
|---|---|---|
| committer | Jiao Li <angela@lindenlab.com> | 2009-09-22 04:30:11 +0000 |
| commit | 760adead96e62cab8f9cdacc6469773a87dfbc1a (patch) | |
| tree | 40e8551f5ee56ed7ba3297e13fd2d410a2facd1e | |
| parent | 34b00eeda21c9a1e124709ca3c27ae7777f0b8a0 (diff) | |
EXT-1006 Name Tag options not remembered in the Preferences window -- to be reviewed
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_general.xml | 1 |
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" |