1 files changed, 51 insertions, 3 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index aa620625ea..b29d1706c4 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -44,6 +44,7 @@
 #include "llchicletbar.h"
 #include "llconsole.h"
 #include "lldonotdisturbnotificationstorage.h"
+#include "llenvironment.h"
 #include "llfirstuse.h"
 #include "llfloatercamera.h"
 #include "llfloaterimcontainer.h"
@@ -430,6 +431,7 @@ LLAgent::LLAgent() :
     mIsDoNotDisturb(false),
 
     mControlFlags(0x00000000),
+    mLastJumpInputTime(0.0),
 
     mAutoPilot(false),
     mAutoPilotFlyOnStop(false),
@@ -581,6 +583,9 @@ void LLAgent::setFirstLogin(bool b)
         {
             setFeatureVersion(UI_FEATURE_VERSION, UI_FEATURE_FLAGS);
         }
+
+        // Shared environment on teleport should only be enabled by default for new users;
+        gSavedSettings.setBOOL("SwitchToSharedEnvAfterTeleport", true);
     }
 }
 
@@ -784,6 +789,10 @@ void LLAgent::moveUp(S32 direction)
 
     if (direction > 0)
     {
+        if (!getFlying())
+        {
+            mLastJumpInputTime = LLTimer::getTotalSeconds();
+        }
         setControlFlags(AGENT_CONTROL_UP_POS | AGENT_CONTROL_FAST_UP);
     }
     else if (direction < 0)
@@ -2118,6 +2127,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;
@@ -2129,6 +2145,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());
 }
 
@@ -2242,7 +2263,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
@@ -2364,7 +2386,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
@@ -2677,7 +2700,24 @@ void LLAgent::onAnimStop(const LLUUID& id)
     }
     else if (id == ANIM_AGENT_PRE_JUMP || id == ANIM_AGENT_LAND || id == ANIM_AGENT_MEDIUM_LAND)
     {
-        setControlFlags(AGENT_CONTROL_FINISH_ANIM);
+        // FIRE-34049/FIRE-34273/https://github.com/secondlife/viewer/issues/4218
+        // Avoid forcing AGENT_CONTROL_FINISH_ANIM on landing, which can short-circuit the
+        // next pre-jump during rapid successive jumps.
+        // Do not suppress pre-jump finish, otherwise a quick tap from standing can stall.
+        // TODO: a more robust fix would require knowing which specific animation finished,
+        // information that is not currently provided by the simulator.
+        const bool is_landing_anim = (id == ANIM_AGENT_LAND || id == ANIM_AGENT_MEDIUM_LAND);
+        const bool up_pos = (mControlFlags & AGENT_CONTROL_UP_POS) != 0;
+        const F64 now = LLTimer::getTotalSeconds();
+        const F64 elapsed = now - mLastJumpInputTime;
+        static LLCachedControl<F32> recent_jump_threshold_secs(gSavedSettings, "RecentJumpThresholdSecs", 1.0);
+        const bool recent_jump = (mLastJumpInputTime > 0.0) && (elapsed < recent_jump_threshold_secs);
+        const bool suppress_finish = is_landing_anim && recent_jump;
+
+        if (!up_pos && !suppress_finish)
+        {
+            setControlFlags(AGENT_CONTROL_FINISH_ANIM);
+        }
     }
 }
 
@@ -4133,6 +4173,7 @@ void LLAgent::handleTeleportFinished()
     }
     clearTeleportRequest();
     mTeleportCanceled.reset();
+    LLVOAvatar::resetEarlyAppearanceList();
     if (mIsMaturityRatingChangingDuringTeleport)
     {
         // notify user that the maturity preference has been changed
@@ -4164,6 +4205,11 @@ void LLAgent::handleTeleportFinished()
             mRegionp->setCapabilitiesReceivedCallback(boost::bind(&LLAgent::onCapabilitiesReceivedAfterTeleport));
         }
     }
+    static LLCachedControl<bool> shared_env_on_teleport(gSavedSettings, "SwitchToSharedEnvAfterTeleport", true);
+    if (shared_env_on_teleport)
+    {
+        LLEnvironment::instance().setSharedEnvironment();
+    }
     LLPerfStats::tunables.autoTuneTimeout = true;
 }
 
@@ -4864,6 +4910,8 @@ const std::string& LLAgent::getTeleportStateName() const
 
 void LLAgent::parseTeleportMessages(const std::string& xml_filename)
 {
+    LL_PROFILE_ZONE_SCOPED;
+
     LLXMLNodePtr root;
     bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);