From 67de2a2133821dfcc9ae193a666e51919d372f84 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 6 Jul 2010 15:28:26 +0200
Subject: fix: further objects are not rezzing after login. Reverts
 362e10f6c08a68624ca6.

362e10f6c08a68624ca6 is a partial revert of the revert of cad41f1.
---
 linden/indra/newview/llviewermessage.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index b1c316d..ecbe0ef 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3331,18 +3331,14 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
 	// set our upstream host the new simulator and shuffle things as
 	// appropriate.
-	// Sometimes OpenSim will get here but still fail on a teleport -- MC
-	if (regionp != gAgent.getRegion())
-	{
-		LLVector3 shift_vector = regionp->getPosRegionFromGlobal(
-			gAgent.getRegion()->getOriginGlobal());
-		gAgent.setRegion(regionp);
-		gObjectList.shiftObjects(shift_vector);
-		gAssetStorage->setUpstream(msg->getSender());
-		gCacheName->setUpstream(msg->getSender());
-		gViewerThrottle.sendToSim();
-		gViewerWindow->sendShapeToSim();
-	}
+	LLVector3 shift_vector = regionp->getPosRegionFromGlobal(
+		gAgent.getRegion()->getOriginGlobal());
+	gAgent.setRegion(regionp);
+	gObjectList.shiftObjects(shift_vector);
+	gAssetStorage->setUpstream(msg->getSender());
+	gCacheName->setUpstream(msg->getSender());
+	gViewerThrottle.sendToSim();
+	gViewerWindow->sendShapeToSim();
 
 	bool is_teleport = gAgent.getTeleportState() == LLAgent::TELEPORT_MOVING;
 
-- 
cgit v1.1