Merge pull request #4379 from secondlife/release/2025.06

Release/2025.06

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp
index dd7c6aa9e3..e02f76711c 100644
--- a/indra/newview/llteleporthistorystorage.cpp
+++ b/indra/newview/llteleporthistorystorage.cpp
@@ -127,6 +127,12 @@ void LLTeleportHistoryStorage::addItem(const std::string title, const LLVector3d
     S32 removed_index = -1;
     if (item_iter != mItems.end())
     {
+        // When teleporting via history it's possible that there can be
+        // an offset applied to the position, so each new teleport can
+        // be a meter higher than the last.
+        // Avoid it by preserving original position.
+        item.mGlobalPos = item_iter->mGlobalPos;
+
         removed_index = (S32)(item_iter - mItems.begin());
         mItems.erase(item_iter);
     }