Added debug setting AppearanceForceStand to toggle whether avatar stands when editing appearance

2 files changed, 15 insertions, 2 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 305454e..ff55c90 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2,8 +2,19 @@
 <llsd>
 <map>
   
-  <!-- Show statistics in mouselook -->
+  <!-- Imprudence-specific settings -->
 
+  <key>AppearanceForceStand</key>
+  <map>
+    <key>Comment</key>
+    <string>Unsit avatar when entering appearance mode?</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>ShowStatusBarInMouselook</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index e0fde62..6e61859 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4282,13 +4282,15 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
         }
 
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if(gSavedSettings.getBOOL("AppearanceForceStand"))
         if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) )
         {
                 return;
         }
 // [/RLVa:KB]
 
-        setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
+        if(gSavedSettings.getBOOL("AppearanceForceStand"))
+                setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
         gViewerWindow->getWindow()->resetBusyCount();
 
         if (gFaceEditToolset)