aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprefsadvanced.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-05-25 17:57:53 -0700
committerJacek Antonelli2010-06-19 02:43:00 -0500
commitd98f95c5178747d947b19403da379e49911abfdc (patch)
treea6860c117ef6b7d0fb5a7a373ff5eb0f31c41413 /linden/indra/newview/llprefsadvanced.cpp
parentAdded button to Preferences > Advanced to reset all preferences (#272) (diff)
downloadmeta-impy-d98f95c5178747d947b19403da379e49911abfdc.zip
meta-impy-d98f95c5178747d947b19403da379e49911abfdc.tar.gz
meta-impy-d98f95c5178747d947b19403da379e49911abfdc.tar.bz2
meta-impy-d98f95c5178747d947b19403da379e49911abfdc.tar.xz
Changed AppearanceForceStand to AppearanceAnimate, made it toggle both standing up and animating the avatar when editing appearance
Diffstat (limited to 'linden/indra/newview/llprefsadvanced.cpp')
-rw-r--r--linden/indra/newview/llprefsadvanced.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index e109818..070422b 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -59,7 +59,7 @@ BOOL LLPrefsAdvanced::postBuild()
59 childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP")); 59 childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
60 childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez")); 60 childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
61 childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval")); 61 childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
62 childSetValue("appearance_stand_check", gSavedSettings.getBOOL("AppearanceForceStand")); 62 childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
63 childSetValue("mute_wind_check", !gSavedSettings.getBOOL("MuteWind")); 63 childSetValue("mute_wind_check", !gSavedSettings.getBOOL("MuteWind"));
64 64
65 refresh(); 65 refresh();
@@ -75,7 +75,7 @@ void LLPrefsAdvanced::apply()
75 gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check")); 75 gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check"));
76 gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check")); 76 gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
77 gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal()); 77 gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
78 gSavedSettings.setBOOL("AppearanceForceStand", childGetValue("appearance_stand_check")); 78 gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
79 gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean())); 79 gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean()));
80 80
81 // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC 81 // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC