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

---
 .../Framework/EntityTransfer/EntityTransferModule.cs        | 6 ++++--
 OpenSim/Region/Framework/Scenes/Scene.cs                    | 2 +-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 31db778c4a..8ce6bb4cf1 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
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f4622b698d..705660d38f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3700,7 +3700,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     else
                     {
-                        sp.DoNotClose = true;
+                        sp.DoNotCloseAfterTeleport = true;
                     }
                 }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d3e1946875..4044f0c757 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -722,7 +722,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// teleport is reusing the connection.
         /// </summary>
         /// <remarks>May be refactored or move somewhere else soon.</remarks>
-        public bool DoNotClose { get; set; }
+        public bool DoNotCloseAfterTeleport { get; set; }
 
         private float m_speedModifier = 1.0f;