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/Framework/Scenes/SceneBase.cs | |
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/Framework/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 5252b96..4b37983 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -218,19 +218,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
218 | 218 | ||
219 | public abstract ISceneAgent AddNewClient(IClientAPI client, PresenceType type); | 219 | public abstract ISceneAgent AddNewClient(IClientAPI client, PresenceType type); |
220 | 220 | ||
221 | /// <summary> | 221 | public abstract bool CloseAgent(UUID agentID, bool force); |
222 | /// Remove the given client from the scene. | ||
223 | /// </summary> | ||
224 | /// <remarks> | ||
225 | /// Only clientstack code should call this directly. All other code should call IncomingCloseAgent() instead | ||
226 | /// to properly operate the state machine and avoid race conditions with other close requests (such as directly | ||
227 | /// from viewers). | ||
228 | /// </remarks> | ||
229 | /// <param name='agentID'>ID of agent to close</param> | ||
230 | /// <param name='closeChildAgents'> | ||
231 | /// Close the neighbour child agents associated with this client. | ||
232 | /// </param> | ||
233 | public abstract void RemoveClient(UUID agentID, bool closeChildAgents); | ||
234 | 222 | ||
235 | public bool TryGetScenePresence(UUID agentID, out object scenePresence) | 223 | public bool TryGetScenePresence(UUID agentID, out object scenePresence) |
236 | { | 224 | { |