aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprefsadvanced.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2010-08-01 03:26:57 -0500
committerJacek Antonelli2010-08-01 03:42:42 -0500
commita9b6989fad493ccc2bb8aae0ffe1e11783635261 (patch)
tree10fd417e2798c76e96bcc1c72fece02ec77a38cd /linden/indra/newview/llprefsadvanced.cpp
parentRemoved control_name from old combo boxes to avoid conflicts. (diff)
downloadmeta-impy-a9b6989fad493ccc2bb8aae0ffe1e11783635261.zip
meta-impy-a9b6989fad493ccc2bb8aae0ffe1e11783635261.tar.gz
meta-impy-a9b6989fad493ccc2bb8aae0ffe1e11783635261.tar.bz2
meta-impy-a9b6989fad493ccc2bb8aae0ffe1e11783635261.tar.xz
Revamped the LightShare option in Preferences > Advanced.
Instead of a checkbox, it's now a combo box with "Never", "Ask me every time", or "Always".
Diffstat (limited to 'linden/indra/newview/llprefsadvanced.cpp')
-rw-r--r--linden/indra/newview/llprefsadvanced.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 6489f52..675a87f 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -58,7 +58,6 @@ BOOL LLPrefsAdvanced::postBuild()
58 childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens")); 58 childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
59 childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens")); 59 childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
60 childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag")); 60 childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag"));
61 childSetValue("windlight_check", gSavedSettings.getBOOL("UseServersideWindlightSettings"));
62 childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers")); 61 childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
63 childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP")); 62 childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
64 childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez")); 63 childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
@@ -84,7 +83,6 @@ void LLPrefsAdvanced::apply()
84 gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check")); 83 gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
85 gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal()); 84 gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
86 gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check")); 85 gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
87 gSavedSettings.setBOOL("UseServersideWindlightSettings", childGetValue("windlight_check"));
88 gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public")); 86 gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
89 87
90 // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC 88 // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC