aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llagent.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llagent.cpp')
-rw-r--r--linden/indra/newview/llagent.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 1a65cb1..859f7f6 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4299,14 +4299,14 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
4299 } 4299 }
4300 4300
4301// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) 4301// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
4302 if(gSavedSettings.getBOOL("AppearanceForceStand")) 4302 if(gSavedSettings.getBOOL("AppearanceAnimate"))
4303 if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) ) 4303 if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) )
4304 { 4304 {
4305 return; 4305 return;
4306 } 4306 }
4307// [/RLVa:KB] 4307// [/RLVa:KB]
4308 4308
4309 if(gSavedSettings.getBOOL("AppearanceForceStand")) 4309 if(gSavedSettings.getBOOL("AppearanceAnimate"))
4310 setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up 4310 setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
4311 gViewerWindow->getWindow()->resetBusyCount(); 4311 gViewerWindow->getWindow()->resetBusyCount();
4312 4312
@@ -4350,7 +4350,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
4350 4350
4351 if (mAvatarObject.notNull()) 4351 if (mAvatarObject.notNull())
4352 { 4352 {
4353 if(avatar_animate) 4353 if(avatar_animate && gSavedSettings.getBOOL("AppearanceAnimate"))
4354 { 4354 {
4355 // Remove any pitch from the avatar 4355 // Remove any pitch from the avatar
4356 LLVector3 at = mFrameAgent.getAtAxis(); 4356 LLVector3 at = mFrameAgent.getAtAxis();