Applied patch for long distance opensim hypergrid tps (SVC-2491) (Feature currently disabled in OpenSim)

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index c49d154..4df4f11 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -9,7 +9,12 @@
                 modified:   newview/llinventoryview.cpp
                 modified:   newview/skins/default/xui/en-us/floater_inventory.xml
 
-
+     * Applied patch for long distance opensim hypergrid tps (SVC-2491)
+           (Feature currently disabled in OpenSim)
+           
+                modified:   linden/indra/newview/llviewermessage.cpp
+           
+           
 2009-09-10  McCabe Maxsted  <hakushakukun@gmail.com>
  
      * Created new toolbar control for windlight presets and options.
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 3fb8e9a..e4de5b4 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2718,6 +2718,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());