1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 0a1bd98..18475c6 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"
@@ -4069,6 +4070,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;
@@ -6030,7 +6032,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