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/Avatar | |
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/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index fd493fc..4e58045 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -719,7 +719,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
719 | SceneObjectGroup rezzedAtt = presence.GetAttachments()[0]; | 719 | SceneObjectGroup rezzedAtt = presence.GetAttachments()[0]; |
720 | 720 | ||
721 | m_numberOfAttachEventsFired = 0; | 721 | m_numberOfAttachEventsFired = 0; |
722 | scene.IncomingCloseAgent(presence.UUID, false); | 722 | scene.CloseAgent(presence.UUID, false); |
723 | 723 | ||
724 | // Check that we can't retrieve this attachment from the scene. | 724 | // Check that we can't retrieve this attachment from the scene. |
725 | Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null); | 725 | Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index 0cd495c..3b6d970 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
@@ -272,7 +272,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
272 | if (sp.IsChildAgent) | 272 | if (sp.IsChildAgent) |
273 | return; | 273 | return; |
274 | sp.ControllingClient.Kick(reason); | 274 | sp.ControllingClient.Kick(reason); |
275 | sp.Scene.IncomingCloseAgent(sp.UUID, true); | 275 | sp.Scene.CloseAgent(sp.UUID, true); |
276 | } | 276 | } |
277 | 277 | ||
278 | private void OnIncomingInstantMessage(GridInstantMessage msg) | 278 | private void OnIncomingInstantMessage(GridInstantMessage msg) |