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

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

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f4622b6..705660d 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 d3e1946..4044f0c 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;
 
-- 
cgit v1.1