diff options
author | McCabe Maxsted | 2010-05-01 00:05:27 -0700 |
---|---|---|
committer | Jacek Antonelli | 2010-05-04 03:00:01 -0500 |
commit | 54c956d5f7015631a047db0d86ece3b623a7cbf2 (patch) | |
tree | d7fc1695c876a4fde79b38c929c8c802b40dc421 /linden | |
parent | Fixed en-us profile layout oddities for the avatar, interests, picks, and cla... (diff) | |
download | meta-impy-54c956d5f7015631a047db0d86ece3b623a7cbf2.zip meta-impy-54c956d5f7015631a047db0d86ece3b623a7cbf2.tar.gz meta-impy-54c956d5f7015631a047db0d86ece3b623a7cbf2.tar.bz2 meta-impy-54c956d5f7015631a047db0d86ece3b623a7cbf2.tar.xz |
Added checkbox to preferences > advanced for sitting when editing appearance
Diffstat (limited to 'linden')
-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 b30e55a..2ad8de2 100644 --- a/linden/indra/newview/llprefsadvanced.cpp +++ b/linden/indra/newview/llprefsadvanced.cpp | |||
@@ -56,6 +56,7 @@ BOOL LLPrefsAdvanced::postBuild() | |||
56 | childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP")); | 56 | childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP")); |
57 | childSetValue("speedrez_check", gSavedSettings.getBOOL("SpeedRez")); | 57 | childSetValue("speedrez_check", gSavedSettings.getBOOL("SpeedRez")); |
58 | childSetValue("speedrez_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval")); | 58 | childSetValue("speedrez_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval")); |
59 | childSetValue("appearance_stand_check", gSavedSettings.getBOOL("AppearanceForceStand")); | ||
59 | 60 | ||
60 | return TRUE; | 61 | return TRUE; |
61 | } | 62 | } |
@@ -68,6 +69,7 @@ void LLPrefsAdvanced::apply() | |||
68 | gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check")); | 69 | gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check")); |
69 | gSavedSettings.setBOOL("SpeedRez", childGetValue("speedrez_check")); | 70 | gSavedSettings.setBOOL("SpeedRez", childGetValue("speedrez_check")); |
70 | gSavedSettings.setU32("SpeedRezInterval", childGetValue("speedrez_spinner").asReal()); | 71 | gSavedSettings.setU32("SpeedRezInterval", childGetValue("speedrez_spinner").asReal()); |
72 | gSavedSettings.setBOOL("AppearanceForceStand", childGetValue("appearance_stand_check")); | ||
71 | 73 | ||
72 | // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC | 74 | // 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")) | 75 | 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 3c3c002..fa33055 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 | |||
@@ -39,5 +39,9 @@ | |||
39 | follows="left|top" height="16" increment="1" initial_val="12" | 39 | follows="left|top" height="16" increment="1" initial_val="12" |
40 | label="Step interval (seconds)" label_width="130" left_delta="0" max_val="20" | 40 | label="Step interval (seconds)" label_width="130" left_delta="0" max_val="20" |
41 | min_val="1" mouse_opaque="true" name="spinner_decimal" width="170" /> | 41 | min_val="1" mouse_opaque="true" name="spinner_decimal" width="170" /> |
42 | <check_box bottom_delta="-25" enabled="true" follows="left|top" | ||
43 | font="SansSerifSmall" height="16" initial_value="false" | ||
44 | label="Stand when editing appearance" left="12" mouse_opaque="true" | ||
45 | name="appearance_stand_check" radio_style="false" width="217" /> | ||
42 | 46 | ||
43 | </panel> | 47 | </panel> |