1 files changed, 4 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 26dd86c..815dc49 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2754,6 +2754,10 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
         // appropriate.
         LLVector3 shift_vector = regionp->getPosRegionFromGlobal(
                 gAgent.getRegion()->getOriginGlobal());
+        // don't shift objects, if teleporting more than about 1000 sims, as
+        // for long teleports shifting objects garbles the view at the target region
+        if (shift_vector.lengthSquared() > 6.5e10f)
+                shift_vector = LLVector3::zero;
         gAgent.setRegion(regionp);
         gObjectList.shiftObjects(shift_vector);
         gAssetStorage->setUpstream(msg->getSender());