diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
4 files changed, 10 insertions, 9 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/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 3396c32..fea9ddf 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -750,7 +750,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
750 | 750 | ||
751 | public virtual void Start() | 751 | public virtual void Start() |
752 | { | 752 | { |
753 | m_scene.AddNewClient(this, PresenceType.User); | 753 | m_scene.AddNewAgent(this, PresenceType.User); |
754 | 754 | ||
755 | RefreshGroupMembership(); | 755 | RefreshGroupMembership(); |
756 | } | 756 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 9504f15..8d957dc 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1718,7 +1718,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1718 | else if (client.SceneAgent == null) | 1718 | else if (client.SceneAgent == null) |
1719 | { | 1719 | { |
1720 | // This check exists to catch a condition where the new client has been added to the client | 1720 | // This check exists to catch a condition where the new client has been added to the client |
1721 | // manager but the SceneAgent has not yet been set in Scene.AddNewClient(). If we are too | 1721 | // manager but the SceneAgent has not yet been set in Scene.AddNewAgent(). If we are too |
1722 | // eager, then the new ScenePresence may not have registered a listener for this messsage | 1722 | // eager, then the new ScenePresence may not have registered a listener for this messsage |
1723 | // before we try to process it. | 1723 | // before we try to process it. |
1724 | // XXX: A better long term fix may be to add the SceneAgent before the client is added to | 1724 | // XXX: A better long term fix may be to add the SceneAgent before the client is added to |
@@ -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..e2178e5 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | |||
@@ -52,17 +52,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
52 | public override void Update(int frames) {} | 52 | public override void Update(int frames) {} |
53 | public override void LoadWorldMap() {} | 53 | public override void LoadWorldMap() {} |
54 | 54 | ||
55 | public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type) | 55 | public override ISceneAgent AddNewAgent(IClientAPI client, PresenceType type) |
56 | { | 56 | { |
57 | client.OnObjectName += RecordObjectNameCall; | 57 | client.OnObjectName += RecordObjectNameCall; |
58 | 58 | ||
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) {} | 64 | |
65 | public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; } | 65 | public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; } |
66 | |||
66 | public override void OtherRegionUp(GridRegion otherRegion) { } | 67 | public override void OtherRegionUp(GridRegion otherRegion) { } |
67 | 68 | ||
68 | public override bool TryGetScenePresence(UUID uuid, out ScenePresence sp) { sp = null; return false; } | 69 | public override bool TryGetScenePresence(UUID uuid, out ScenePresence sp) { sp = null; return false; } |