diff options
author | Justin Clark-Casey (justincc) | 2013-07-26 01:38:04 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-26 01:38:04 +0100 |
commit | 72ed49af5f864e50fa4453849a94dd9d46533cba (patch) | |
tree | f8325f04707a21ef1aa51bc351a49bec2ba3de9b /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
parent | If a returning teleport starts to reuse a downgraded child connection that wa... (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 |
1 files changed, 4 insertions, 2 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 |