aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorArmin Weatherwax2010-04-05 18:07:25 +0200
committerArmin Weatherwax2010-04-12 17:11:07 +0200
commit861b5ef1203d71bf3893decf26b9ff063c12601f (patch)
tree30a04f32979dd66e0a222fd13d65a23d1c7efa60 /linden/indra/newview
parentfix: handle bad ping more relaxed. (diff)
downloadmeta-impy-861b5ef1203d71bf3893decf26b9ff063c12601f.zip
meta-impy-861b5ef1203d71bf3893decf26b9ff063c12601f.tar.gz
meta-impy-861b5ef1203d71bf3893decf26b9ff063c12601f.tar.bz2
meta-impy-861b5ef1203d71bf3893decf26b9ff063c12601f.tar.xz
fix: Bug #239 by reverting commit 187e36f6: invisible Textures on HG
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llviewermessage.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 8739f5c..afd8503 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3049,10 +3049,6 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
3049 // appropriate. 3049 // appropriate.
3050 LLVector3 shift_vector = regionp->getPosRegionFromGlobal( 3050 LLVector3 shift_vector = regionp->getPosRegionFromGlobal(
3051 gAgent.getRegion()->getOriginGlobal()); 3051 gAgent.getRegion()->getOriginGlobal());
3052 // don't shift objects, if teleporting more than about 1000 sims, as
3053 // for long teleports shifting objects garbles the view at the target region
3054 if (shift_vector.lengthSquared() > 6.5e10f)
3055 shift_vector = LLVector3::zero;
3056 gAgent.setRegion(regionp); 3052 gAgent.setRegion(regionp);
3057 gObjectList.shiftObjects(shift_vector); 3053 gObjectList.shiftObjects(shift_vector);
3058 gAssetStorage->setUpstream(msg->getSender()); 3054 gAssetStorage->setUpstream(msg->getSender());