diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llprefsadvanced.cpp | 20 | ||||
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 5 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml | 4 |
3 files changed, 26 insertions, 3 deletions
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp index 394c325..b30e55a 100644 --- a/linden/indra/newview/llprefsadvanced.cpp +++ b/linden/indra/newview/llprefsadvanced.cpp | |||
@@ -30,8 +30,10 @@ | |||
30 | 30 | ||
31 | #include "llviewerprecompiledheaders.h" | 31 | #include "llviewerprecompiledheaders.h" |
32 | 32 | ||
33 | #include "llagent.h" | ||
33 | #include "llprefsadvanced.h" | 34 | #include "llprefsadvanced.h" |
34 | #include "llviewercontrol.h" | 35 | #include "llviewercontrol.h" |
36 | #include "llvoavatar.h" | ||
35 | 37 | ||
36 | #include "lluictrlfactory.h" | 38 | #include "lluictrlfactory.h" |
37 | 39 | ||
@@ -49,7 +51,8 @@ BOOL LLPrefsAdvanced::postBuild() | |||
49 | { | 51 | { |
50 | childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens")); | 52 | childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens")); |
51 | childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens")); | 53 | childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens")); |
52 | childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ClothingLayerProtection")); | 54 | childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag")); |
55 | childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ClothingLayerProtection")); | ||
53 | childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP")); | 56 | childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP")); |
54 | childSetValue("speedrez_check", gSavedSettings.getBOOL("SpeedRez")); | 57 | childSetValue("speedrez_check", gSavedSettings.getBOOL("SpeedRez")); |
55 | childSetValue("speedrez_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval")); | 58 | childSetValue("speedrez_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval")); |
@@ -61,11 +64,24 @@ void LLPrefsAdvanced::apply() | |||
61 | { | 64 | { |
62 | gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check")); | 65 | gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check")); |
63 | gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check")); | 66 | gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check")); |
64 | gSavedSettings.setBOOL("ClothingLayerProtection", childGetValue("client_name_tag_check")); | 67 | gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check")); |
65 | gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check")); | 68 | gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check")); |
66 | gSavedSettings.setBOOL("SpeedRez", childGetValue("speedrez_check")); | 69 | gSavedSettings.setBOOL("SpeedRez", childGetValue("speedrez_check")); |
67 | gSavedSettings.setU32("SpeedRezInterval", childGetValue("speedrez_spinner").asReal()); | 70 | gSavedSettings.setU32("SpeedRezInterval", childGetValue("speedrez_spinner").asReal()); |
68 | 71 | ||
72 | // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC | ||
73 | if (gSavedSettings.getBOOL("ClothingLayerProtection") != (BOOL)childGetValue("client_name_tag_broadcast_check")) | ||
74 | { | ||
75 | LLVOAvatar* avatar = gAgent.getAvatarObject(); | ||
76 | if (avatar) | ||
77 | { | ||
78 | // Slam pending upload count to "unstick" things | ||
79 | bool slam_for_debug = true; | ||
80 | avatar->forceBakeAllTextures(slam_for_debug); | ||
81 | } | ||
82 | } | ||
83 | gSavedSettings.setBOOL("ClothingLayerProtection", childGetValue("client_name_tag_broadcast_check")); | ||
84 | |||
69 | // This is bad bad BAD UI from Emerald, I know. | 85 | // This is bad bad BAD UI from Emerald, I know. |
70 | // If anyone wants to do this better, please do -- MC | 86 | // If anyone wants to do this better, please do -- MC |
71 | if ( childGetValue("shadows_check").asBoolean() ) | 87 | if ( childGetValue("shadows_check").asBoolean() ) |
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 0f1e2a3..bf96ad1 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
@@ -3480,7 +3480,10 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) | |||
3480 | if(!mIsSelf) //don't know your own client ? | 3480 | if(!mIsSelf) //don't know your own client ? |
3481 | { | 3481 | { |
3482 | new_name = TRUE; //lol or see the last client used | 3482 | new_name = TRUE; //lol or see the last client used |
3483 | resolveClient(avatar_name_color,client, this); | 3483 | if (gSavedSettings.getBOOL("ShowClientNameTag")) |
3484 | { | ||
3485 | resolveClient(avatar_name_color,client, this); | ||
3486 | } | ||
3484 | } | 3487 | } |
3485 | avatar_name_color.setAlpha(alpha); | 3488 | avatar_name_color.setAlpha(alpha); |
3486 | mNameText->setColor(avatar_name_color); | 3489 | mNameText->setColor(avatar_name_color); |
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 4eda819..3c3c002 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 | |||
@@ -18,6 +18,10 @@ | |||
18 | font="SansSerifSmall" height="16" initial_value="false" | 18 | font="SansSerifSmall" height="16" initial_value="false" |
19 | label="Show Client Names in Name Tag" left="12" mouse_opaque="true" | 19 | label="Show Client Names in Name Tag" left="12" mouse_opaque="true" |
20 | name="client_name_tag_check" radio_style="false" width="217" /> | 20 | name="client_name_tag_check" radio_style="false" width="217" /> |
21 | <check_box bottom_delta="-18" enabled="true" follows="left|top" | ||
22 | font="SansSerifSmall" height="16" initial_value="false" | ||
23 | label="Broadcast Your Client Name to Others" left="12" mouse_opaque="true" | ||
24 | name="client_name_tag_broadcast_check" radio_style="false" width="217" /> | ||
21 | <check_box bottom_delta="-25" enabled="true" follows="left|top" | 25 | <check_box bottom_delta="-25" enabled="true" follows="left|top" |
22 | font="SansSerifSmall" height="16" initial_value="false" | 26 | font="SansSerifSmall" height="16" initial_value="false" |
23 | label="Enable Shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true" | 27 | label="Enable Shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true" |