Partially reverted cad41f1 and 65a5856 to help login issues.

This reverts (except for some parts):
- Commit cad41f1ae08927737eca4cd9df25381d78e82304.
  "Fixed #338: addRegion/removeRegion can trigger a viewer quit"
- Commit 65a5856f9567074886f28df59a26433c4b447576.
  "wip forcing region disconnects to log you out"

1 files 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;