diff options
author | Tom Grimshaw | 2010-05-26 16:25:27 +0100 |
---|---|---|
committer | Jacek Antonelli | 2010-06-19 02:43:26 -0500 |
commit | d16091f125459dfd47fca1f5b02ebd1981f4c06b (patch) | |
tree | eebd36b42dc6aeaad036012d3fe96eb0549f51cf | |
parent | LightShare: Add proper decoding of the water normal map UUID (diff) | |
download | meta-impy-d16091f125459dfd47fca1f5b02ebd1981f4c06b.zip meta-impy-d16091f125459dfd47fca1f5b02ebd1981f4c06b.tar.gz meta-impy-d16091f125459dfd47fca1f5b02ebd1981f4c06b.tar.bz2 meta-impy-d16091f125459dfd47fca1f5b02ebd1981f4c06b.tar.xz |
Add "Use server-side Windlight settings" to Preferences -> Advanced.
-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 070422b..a4c0dc2 100644 --- a/linden/indra/newview/llprefsadvanced.cpp +++ b/linden/indra/newview/llprefsadvanced.cpp | |||
@@ -55,6 +55,7 @@ BOOL LLPrefsAdvanced::postBuild() | |||
55 | childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens")); | 55 | childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens")); |
56 | childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens")); | 56 | childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens")); |
57 | childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag")); | 57 | childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag")); |
58 | childSetValue("windlight_check", gSavedSettings.getBOOL("UseServersideWindlightSettings")); | ||
58 | childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ClothingLayerProtection")); | 59 | childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ClothingLayerProtection")); |
59 | childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP")); | 60 | childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP")); |
60 | childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez")); | 61 | childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez")); |
@@ -77,6 +78,7 @@ void LLPrefsAdvanced::apply() | |||
77 | gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal()); | 78 | gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal()); |
78 | gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check")); | 79 | gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check")); |
79 | gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean())); | 80 | gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean())); |
81 | gSavedSettings.setBOOL("UseServersideWindlightSettings", childGetValue("windlight_check")); | ||
80 | 82 | ||
81 | // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC | 83 | // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC |
82 | if (gSavedSettings.getBOOL("ClothingLayerProtection") != (BOOL)childGetValue("client_name_tag_broadcast_check")) | 84 | if (gSavedSettings.getBOOL("ClothingLayerProtection") != (BOOL)childGetValue("client_name_tag_broadcast_check")) |
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 640385a..3adc36d 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 | |||
@@ -26,6 +26,10 @@ | |||
26 | font="SansSerifSmall" height="16" initial_value="false" | 26 | font="SansSerifSmall" height="16" initial_value="false" |
27 | 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" |
28 | name="shadows_check" radio_style="false" width="217" /> | 28 | name="shadows_check" radio_style="false" width="217" /> |
29 | <check_box bottom_delta="-25" enabled="true" follows="left|top" | ||
30 | font="SansSerifSmall" height="16" initial_value="true" | ||
31 | label="Use server-side Windlight settings" left="12" mouse_opaque="true" | ||
32 | name="windlight_check" radio_style="false" width="217" /> | ||
29 | <check_box bottom_delta="-18" enabled="true" follows="left|top" | 33 | <check_box bottom_delta="-18" enabled="true" follows="left|top" |
30 | font="SansSerifSmall" height="16" initial_value="false" | 34 | font="SansSerifSmall" height="16" initial_value="false" |
31 | label="Use HTTP Textures" left="12" mouse_opaque="true" | 35 | label="Use HTTP Textures" left="12" mouse_opaque="true" |