diff options
author | McCabe Maxsted | 2010-04-07 03:19:46 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-04-07 03:19:46 -0700 |
commit | de4a5f78068c6eb04b1b155616e853921f7b8d46 (patch) | |
tree | f84a8d24ec8da5ee0ceac0f63f2a7e048f558519 /linden/indra/newview | |
parent | Use system chat color when DisableLoginLogoutScreens enabled, added logout chat (diff) | |
download | meta-impy-de4a5f78068c6eb04b1b155616e853921f7b8d46.zip meta-impy-de4a5f78068c6eb04b1b155616e853921f7b8d46.tar.gz meta-impy-de4a5f78068c6eb04b1b155616e853921f7b8d46.tar.bz2 meta-impy-de4a5f78068c6eb04b1b155616e853921f7b8d46.tar.xz |
Added checkbox for showing client names in nametag (doesn't change their color though) in Preferences > Advanced
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llprefsadvanced.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp index efb8a27..6558d7b 100644 --- a/linden/indra/newview/llprefsadvanced.cpp +++ b/linden/indra/newview/llprefsadvanced.cpp | |||
@@ -49,6 +49,7 @@ BOOL LLPrefsAdvanced::postBuild() | |||
49 | { | 49 | { |
50 | childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens")); | 50 | childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens")); |
51 | childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens")); | 51 | childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens")); |
52 | childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag")); | ||
52 | 53 | ||
53 | return TRUE; | 54 | return TRUE; |
54 | } | 55 | } |
@@ -57,6 +58,7 @@ void LLPrefsAdvanced::apply() | |||
57 | { | 58 | { |
58 | gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check")); | 59 | gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check")); |
59 | gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check")); | 60 | gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check")); |
61 | gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check")); | ||
60 | } | 62 | } |
61 | 63 | ||
62 | void LLPrefsAdvanced::cancel() | 64 | void LLPrefsAdvanced::cancel() |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml index ba02942..417097d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml | |||
@@ -11,4 +11,8 @@ | |||
11 | font="SansSerifSmall" height="16" initial_value="false" | 11 | font="SansSerifSmall" height="16" initial_value="false" |
12 | label="Disable Teleport Screens" left="12" mouse_opaque="true" | 12 | label="Disable Teleport Screens" left="12" mouse_opaque="true" |
13 | name="disable_tp_screen_check" radio_style="false" width="217" /> | 13 | name="disable_tp_screen_check" radio_style="false" width="217" /> |
14 | <check_box bottom_delta="-25" enabled="true" follows="left|top" | ||
15 | font="SansSerifSmall" height="16" initial_value="false" | ||
16 | label="Show Client Names in Name Tag" left="12" mouse_opaque="true" | ||
17 | name="client_name_tag_check" radio_style="false" width="217" /> | ||
14 | </panel> | 18 | </panel> |