1 files changed, 11 insertions, 2 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 0a1bd98..8c455a5 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -67,6 +67,7 @@
 #include "llface.h"
 #include "llfirstuse.h"
 #include "llfloater.h"
+#include "floaterao.h"
 #include "llfloateractivespeakers.h"
 #include "llfloateravatarinfo.h"
 #include "llfloaterbuildoptions.h"
@@ -79,6 +80,7 @@
 #include "llfloatermap.h"
 #include "llfloatermute.h"
 #include "llfloatersnapshot.h"
+#include "llfloaterstats.h"
 #include "llfloatertools.h"
 #include "llfloaterworldmap.h"
 #include "llgroupmgr.h"
@@ -2874,6 +2876,10 @@ static const LLFloaterView::skip_list_t& get_skip_list()
 {
         static LLFloaterView::skip_list_t skip_list;
         skip_list.insert(LLFloaterMap::getInstance());
+        if(gSavedSettings.getBOOL("ShowStatusBarInMouselook"))
+        {
+                skip_list.insert(LLFloaterStats::getInstance());
+        }
         return skip_list;
 }
 
@@ -4069,6 +4075,7 @@ void LLAgent::changeCameraToMouselook(BOOL animate)
         if( mCameraMode != CAMERA_MODE_MOUSELOOK )
         {
                 gFocusMgr.setKeyboardFocus( NULL );
+                if (gSavedSettings.getBOOL("AONoStandsInMouselook"))    LLFloaterAO::stopMotion(LLFloaterAO::getCurrentStandId(), FALSE,TRUE);
                 
                 mLastCameraMode = mCameraMode;
                 mCameraMode = CAMERA_MODE_MOUSELOOK;
@@ -4276,13 +4283,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)
@@ -6030,7 +6039,7 @@ bool LLAgent::teleportCore(bool is_local)
         if(TELEPORT_NONE != mTeleportState)
         {
                 llwarns << "Attempt to teleport when already teleporting." << llendl;
-                return false;
+                //return false; //This seems to fix getting stuck in TPs in the first place. --Liny
         }
 
 #if 0