diff options
author | Justin Clark-Casey (justincc) | 2013-09-27 19:14:21 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-09-27 19:14:21 +0100 |
commit | b16bc7b01ca0691758e66f85238d657f02271082 (patch) | |
tree | 4e121ace10b7dee25e1311268a84d3e95946f6f9 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | minor code formatting for the sake of consistency and readability (diff) | |
download | opensim-SC_OLD-b16bc7b01ca0691758e66f85238d657f02271082.zip opensim-SC_OLD-b16bc7b01ca0691758e66f85238d657f02271082.tar.gz opensim-SC_OLD-b16bc7b01ca0691758e66f85238d657f02271082.tar.bz2 opensim-SC_OLD-b16bc7b01ca0691758e66f85238d657f02271082.tar.xz |
refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly.
Adds IScene.CloseAgent() to replace RemoveClient()
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 8ae81ac..aa8a4db 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -972,7 +972,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
972 | 972 | ||
973 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) | 973 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) |
974 | { | 974 | { |
975 | if (!sp.Scene.IncomingPreCloseAgent(sp)) | 975 | if (!sp.Scene.IncomingPreCloseClient(sp)) |
976 | return; | 976 | return; |
977 | 977 | ||
978 | // We need to delay here because Imprudence viewers, unlike v1 or v3, have a short (<200ms, <500ms) delay before | 978 | // We need to delay here because Imprudence viewers, unlike v1 or v3, have a short (<200ms, <500ms) delay before |
@@ -983,7 +983,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
983 | // an agent cannot teleport back to this region if it has teleported away. | 983 | // an agent cannot teleport back to this region if it has teleported away. |
984 | Thread.Sleep(2000); | 984 | Thread.Sleep(2000); |
985 | 985 | ||
986 | sp.Scene.IncomingCloseAgent(sp.UUID, false); | 986 | sp.Scene.CloseAgent(sp.UUID, false); |
987 | } | 987 | } |
988 | else | 988 | else |
989 | { | 989 | { |
@@ -1137,7 +1137,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1137 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone | 1137 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone |
1138 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) | 1138 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) |
1139 | { | 1139 | { |
1140 | if (!sp.Scene.IncomingPreCloseAgent(sp)) | 1140 | if (!sp.Scene.IncomingPreCloseClient(sp)) |
1141 | return; | 1141 | return; |
1142 | 1142 | ||
1143 | // RED ALERT!!!! | 1143 | // RED ALERT!!!! |
@@ -1154,7 +1154,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1154 | m_log.DebugFormat( | 1154 | m_log.DebugFormat( |
1155 | "[ENTITY TRANSFER MODULE]: Closing agent {0} in {1} after teleport", sp.Name, Scene.Name); | 1155 | "[ENTITY TRANSFER MODULE]: Closing agent {0} in {1} after teleport", sp.Name, Scene.Name); |
1156 | 1156 | ||
1157 | sp.Scene.IncomingCloseAgent(sp.UUID, false); | 1157 | sp.Scene.CloseAgent(sp.UUID, false); |
1158 | } | 1158 | } |
1159 | else | 1159 | else |
1160 | { | 1160 | { |