1 files changed, 32 insertions, 4 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 3ab87cac13..75a9ef58fc 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -386,6 +386,10 @@ LLAgent::LLAgent() :
     mbRunning(false),
     mbTeleportKeepsLookAt(false),
 
+    mAllowedToStand(true),
+    mAllowedToSit(true),
+    mSitObjectID(LLUUID::null),
+
     mAgentAccess(new LLAgentAccess(gSavedSettings)),
     mGodLevelChangeSignal(),
     mCanEditParcel(false),
@@ -967,7 +971,11 @@ bool LLAgent::isSitting()
 
 void LLAgent::standUp()
 {
-    setControlFlags(AGENT_CONTROL_STAND_UP);
+    if (mAllowedToStand)
+    {
+        setControlFlags(AGENT_CONTROL_STAND_UP);
+        mSitObjectID = LLUUID::null;
+    }
 }
 
 void LLAgent::changeParcels()
@@ -1287,6 +1295,12 @@ const LLVector3 &LLAgent::getPositionAgent()
     return mFrameAgent.getOrigin();
 }
 
+void LLAgent::setAvatarsPositions(const std::map<LLUUID, LLVector3d>& avatarsPositions)
+{
+    mAvatarsPositions.clear();
+    mAvatarsPositions = avatarsPositions;
+}
+
 boost::signals2::connection LLAgent::whenPositionChanged(position_signal_t::slot_type fn)
 {
     return mOnPositionChanged.connect(fn);
@@ -1330,7 +1344,7 @@ LLVector3d LLAgent::getPosGlobalFromAgent(const LLVector3 &pos_agent) const
 
 void LLAgent::sitDown()
 {
-    setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
+    if (mAllowedToSit) setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 }
 
 //-----------------------------------------------------------------------------
@@ -2109,6 +2123,13 @@ std::ostream& operator<<(std::ostream &s, const LLAgent &agent)
 //-----------------------------------------------------------------------------
 bool LLAgent::needsRenderAvatar()
 {
+    // OTS mode: always render avatar — we are in third-person even though
+    // mouselook input is active.
+    if (gAgentCamera.cameraOTS())
+    {
+        return mShowAvatar && mOutfitChosen;
+    }
+
     if (gAgentCamera.cameraMouselook() && !LLVOAvatar::sVisibleInFirstPerson)
     {
         return false;
@@ -2120,6 +2141,11 @@ bool LLAgent::needsRenderAvatar()
 // true if we need to render your own avatar's head.
 bool LLAgent::needsRenderHead()
 {
+    // OTS mode: always render head — avatar is fully visible.
+    if (gAgentCamera.cameraOTS())
+    {
+        return mShowAvatar;
+    }
     return (LLVOAvatar::sVisibleInFirstPerson && LLPipeline::sReflectionRender) || (mShowAvatar && !gAgentCamera.cameraMouselook());
 }
 
@@ -2233,7 +2259,8 @@ void LLAgent::endAnimationUpdateUI()
     }
 
     // clean up UI from mode we're leaving
-    if (gAgentCamera.getLastCameraMode() == CAMERA_MODE_MOUSELOOK )
+    if (gAgentCamera.getLastCameraMode() == CAMERA_MODE_MOUSELOOK
+        || gAgentCamera.getLastCameraMode() == CAMERA_MODE_OTS)
     {
         gToolBarView->setToolBarsVisible(true);
         // show mouse cursor
@@ -2355,7 +2382,8 @@ void LLAgent::endAnimationUpdateUI()
     //---------------------------------------------------------------------
     // Set up UI for mode we're entering
     //---------------------------------------------------------------------
-    if (gAgentCamera.getCameraMode() == CAMERA_MODE_MOUSELOOK)
+    if (gAgentCamera.getCameraMode() == CAMERA_MODE_MOUSELOOK
+        || gAgentCamera.getCameraMode() == CAMERA_MODE_OTS)
     {
         // clean up UI
         // first show anything hidden by UI toggle