aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-09-27 19:14:21 +0100
committerJustin Clark-Casey (justincc)2013-09-27 19:14:21 +0100
commitb16bc7b01ca0691758e66f85238d657f02271082 (patch)
tree4e121ace10b7dee25e1311268a84d3e95946f6f9 /OpenSim/Region/ClientStack/Linden/UDP
parentminor code formatting for the sake of consistency and readability (diff)
downloadopensim-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/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs6
2 files changed, 5 insertions, 5 deletions
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; }