aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-26 01:38:04 +0100
committerJustin Clark-Casey (justincc)2013-07-26 01:38:04 +0100
commit72ed49af5f864e50fa4453849a94dd9d46533cba (patch)
treef8325f04707a21ef1aa51bc351a49bec2ba3de9b /OpenSim
parentIf a returning teleport starts to reuse a downgraded child connection that wa... (diff)
downloadopensim-SC_OLD-72ed49af5f864e50fa4453849a94dd9d46533cba.zip
opensim-SC_OLD-72ed49af5f864e50fa4453849a94dd9d46533cba.tar.gz
opensim-SC_OLD-72ed49af5f864e50fa4453849a94dd9d46533cba.tar.bz2
opensim-SC_OLD-72ed49af5f864e50fa4453849a94dd9d46533cba.tar.xz
Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotClose to DoNotCloseAfterTeleport
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
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 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
1047 1047
1048 if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) 1048 if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
1049 { 1049 {
1050 sp.DoNotCloseAfterTeleport = false;
1051
1050 // RED ALERT!!!! 1052 // RED ALERT!!!!
1051 // PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES. 1053 // PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES.
1052 // THE VIEWERS SEEM TO NEED SOME TIME AFTER RECEIVING MoveAgentIntoRegion 1054 // THE VIEWERS SEEM TO NEED SOME TIME AFTER RECEIVING MoveAgentIntoRegion
@@ -1055,13 +1057,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1055 // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS. 1057 // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS.
1056 Thread.Sleep(15000); 1058 Thread.Sleep(15000);
1057 1059
1058 if (!sp.DoNotClose) 1060 if (!sp.DoNotCloseAfterTeleport)
1059 { 1061 {
1060 sp.Scene.IncomingCloseAgent(sp.UUID, false); 1062 sp.Scene.IncomingCloseAgent(sp.UUID, false);
1061 } 1063 }
1062 else 1064 else
1063 { 1065 {
1064 sp.DoNotClose = false; 1066 sp.DoNotCloseAfterTeleport = false;
1065 } 1067 }
1066 } 1068 }
1067 else 1069 else
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
3700 } 3700 }
3701 else 3701 else
3702 { 3702 {
3703 sp.DoNotClose = true; 3703 sp.DoNotCloseAfterTeleport = true;
3704 } 3704 }
3705 } 3705 }
3706 3706
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
722 /// teleport is reusing the connection. 722 /// teleport is reusing the connection.
723 /// </summary> 723 /// </summary>
724 /// <remarks>May be refactored or move somewhere else soon.</remarks> 724 /// <remarks>May be refactored or move somewhere else soon.</remarks>
725 public bool DoNotClose { get; set; } 725 public bool DoNotCloseAfterTeleport { get; set; }
726 726
727 private float m_speedModifier = 1.0f; 727 private float m_speedModifier = 1.0f;
728 728