#3850 Preserve followcam through momentary avatar loss (#6237)

1 files changed, 12 insertions, 0 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index de8032ac40..0043732182 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8044,6 +8044,18 @@ void LLVOAvatar::getOffObject()
 
     if (sit_object)
     {
+        // A dead sit_object may be temporarily unavailable while it is being
+        // reconstructed during a crossing.
+        // Preserve the follow-cam grace period in that case.
+        // An avatar getting off an object is an explicit action that clears
+        // the grace period on its own.
+        // In such a case, FollowCam Params should've been or will be cleared
+        // in a different path.
+        if (isSelf() && !sit_object->isDead())
+        {
+            gAgentCamera.notifyFollowCamParamsCleared();
+        }
+
         stopMotionFromSource(sit_object->getID());
         LLFollowCamMgr::getInstance()->setCameraActive(sit_object->getID(), false);