From d16091f125459dfd47fca1f5b02ebd1981f4c06b Mon Sep 17 00:00:00 2001 From: Tom Grimshaw Date: Wed, 26 May 2010 16:25:27 +0100 Subject: Add "Use server-side Windlight settings" to Preferences -> Advanced. --- linden/indra/newview/llprefsadvanced.cpp | 2 ++ .../newview/skins/default/xui/en-us/panel_preferences_advanced.xml | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'linden/indra') 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() childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens")); childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens")); childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag")); + childSetValue("windlight_check", gSavedSettings.getBOOL("UseServersideWindlightSettings")); childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ClothingLayerProtection")); childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP")); childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez")); @@ -77,6 +78,7 @@ void LLPrefsAdvanced::apply() gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal()); gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check")); gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean())); + gSavedSettings.setBOOL("UseServersideWindlightSettings", childGetValue("windlight_check")); // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC 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 @@ font="SansSerifSmall" height="16" initial_value="false" label="Enable Shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true" name="shadows_check" radio_style="false" width="217" /> +