From 72ed49af5f864e50fa4453849a94dd9d46533cba Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 01:38:04 +0100
Subject: Reset DoNotClose scene presence teleport flag before pausing.  Rename
 DoNotClose to DoNotCloseAfterTeleport

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework')

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 31db778..8ce6bb4 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1047,6 +1047,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
             {
+                sp.DoNotCloseAfterTeleport = false;
+
                 // RED ALERT!!!!
                 // PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES.
                 // THE VIEWERS SEEM TO NEED SOME TIME AFTER RECEIVING MoveAgentIntoRegion
@@ -1055,13 +1057,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS.
                 Thread.Sleep(15000);
             
-                if (!sp.DoNotClose)
+                if (!sp.DoNotCloseAfterTeleport)
                 {
                     sp.Scene.IncomingCloseAgent(sp.UUID, false);
                 }
                 else
                 {
-                    sp.DoNotClose = false;
+                    sp.DoNotCloseAfterTeleport = false;
                 }
             }
             else
-- 
cgit v1.1