diff options
author | Justin Clark-Casey (justincc) | 2013-09-27 19:14:21 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-09-27 22:29:10 +0100 |
commit | e6c0267def09280761a6f2cbc668b2d0ad7f2753 (patch) | |
tree | 5ee0d4e25b3f5387e694c64325760d3221a2ad06 /OpenSim/Region/ClientStack/Linden | |
parent | minor code formatting for the sake of consistency and readability (diff) | |
download | opensim-SC_OLD-e6c0267def09280761a6f2cbc668b2d0ad7f2753.zip opensim-SC_OLD-e6c0267def09280761a6f2cbc668b2d0ad7f2753.tar.gz opensim-SC_OLD-e6c0267def09280761a6f2cbc668b2d0ad7f2753.tar.bz2 opensim-SC_OLD-e6c0267def09280761a6f2cbc668b2d0ad7f2753.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/ClientStack/Linden')
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs index b3b0b8a..9e24bce 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs | |||
@@ -96,7 +96,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests | |||
96 | UUID spId = TestHelpers.ParseTail(0x1); | 96 | UUID spId = TestHelpers.ParseTail(0x1); |
97 | 97 | ||
98 | SceneHelpers.AddScenePresence(m_scene, spId); | 98 | SceneHelpers.AddScenePresence(m_scene, spId); |
99 | m_scene.IncomingCloseAgent(spId, false); | 99 | m_scene.CloseAgent(spId, false); |
100 | 100 | ||
101 | // TODO: Add more assertions for the other aspects of event queues | 101 | // TODO: Add more assertions for the other aspects of event queues |
102 | Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0)); | 102 | Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0)); |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 9504f15..5296a6d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1893,7 +1893,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1893 | client.Kick("Simulator logged you out due to connection timeout."); | 1893 | client.Kick("Simulator logged you out due to connection timeout."); |
1894 | } | 1894 | } |
1895 | 1895 | ||
1896 | m_scene.IncomingCloseAgent(client.AgentId, true); | 1896 | m_scene.CloseAgent(client.AgentId, true); |
1897 | } | 1897 | } |
1898 | 1898 | ||
1899 | private void IncomingPacketHandler() | 1899 | private void IncomingPacketHandler() |
@@ -2234,7 +2234,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2234 | if (!client.IsLoggingOut) | 2234 | if (!client.IsLoggingOut) |
2235 | { | 2235 | { |
2236 | client.IsLoggingOut = true; | 2236 | client.IsLoggingOut = true; |
2237 | m_scene.IncomingCloseAgent(client.AgentId, false); | 2237 | m_scene.CloseAgent(client.AgentId, false); |
2238 | } | 2238 | } |
2239 | } | 2239 | } |
2240 | } | 2240 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs index 119a677..28b5eb7 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | |||
@@ -59,10 +59,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
59 | // FIXME | 59 | // FIXME |
60 | return null; | 60 | return null; |
61 | } | 61 | } |
62 | 62 | ||
63 | public override void RemoveClient(UUID agentID, bool someReason) {} | 63 | public override bool CloseAgent(UUID agentID, bool force) { return true; } |
64 | // public override void CloseAllAgents(uint circuitcode) {} | ||
65 | public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; } | 64 | public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; } |
65 | |||
66 | public override void OtherRegionUp(GridRegion otherRegion) { } | 66 | public override void OtherRegionUp(GridRegion otherRegion) { } |
67 | 67 | ||
68 | public override bool TryGetScenePresence(UUID uuid, out ScenePresence sp) { sp = null; return false; } | 68 | public override bool TryGetScenePresence(UUID uuid, out ScenePresence sp) { sp = null; return false; } |