diff options
author | John Hurliman | 2009-10-13 14:50:03 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-13 14:50:03 -0700 |
commit | 23a334b9f54a1ef5df3b503c165e7b76b746a2b1 (patch) | |
tree | 93003db47fcd77af4085c0c49cbc1f2f0293b5eb /OpenSim/Region/Framework/Scenes | |
parent | * Unregister event handlers in LLUDPServer when a client logs out and disconn... (diff) | |
download | opensim-SC_OLD-23a334b9f54a1ef5df3b503c165e7b76b746a2b1.zip opensim-SC_OLD-23a334b9f54a1ef5df3b503c165e7b76b746a2b1.tar.gz opensim-SC_OLD-23a334b9f54a1ef5df3b503c165e7b76b746a2b1.tar.bz2 opensim-SC_OLD-23a334b9f54a1ef5df3b503c165e7b76b746a2b1.tar.xz |
* Rewrote ClientManager to remove Lindenisms from OpenSim core, improve performance by removing locks, and replace LLUDPClientCollection
* Removed the confusing (and LL-specific) shutdowncircuit parameter from IClientAPI.Close()
* Updated the LLUDP code to only use ClientManager instead of trying to synchronize ClientManager and m_clients
* Remove clients asynchronously since it is a very slow operation (including a 2000ms sleep)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index dbbf679..ac89f7b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -408,7 +408,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
408 | } | 408 | } |
409 | ViewerEffectPacket.EffectBlock[] effectBlockArray = effectBlock.ToArray(); | 409 | ViewerEffectPacket.EffectBlock[] effectBlockArray = effectBlock.ToArray(); |
410 | 410 | ||
411 | ClientManager.ForEachClient( | 411 | ClientManager.ForEach( |
412 | delegate(IClientAPI client) | 412 | delegate(IClientAPI client) |
413 | { | 413 | { |
414 | if (client.AgentId != remoteClient.AgentId) | 414 | if (client.AgentId != remoteClient.AgentId) |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e81b07b..bb71896 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -867,7 +867,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
867 | Thread.Sleep(500); | 867 | Thread.Sleep(500); |
868 | 868 | ||
869 | // Stop all client threads. | 869 | // Stop all client threads. |
870 | ForEachScenePresence(delegate(ScenePresence avatar) { avatar.ControllingClient.Close(true); }); | 870 | ForEachScenePresence(delegate(ScenePresence avatar) { avatar.ControllingClient.Close(); }); |
871 | 871 | ||
872 | // Stop updating the scene objects and agents. | 872 | // Stop updating the scene objects and agents. |
873 | //m_heartbeatTimer.Close(); | 873 | //m_heartbeatTimer.Close(); |
@@ -3372,7 +3372,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3372 | loggingOffUser.ControllingClient.Kick(message); | 3372 | loggingOffUser.ControllingClient.Kick(message); |
3373 | // Give them a second to receive the message! | 3373 | // Give them a second to receive the message! |
3374 | Thread.Sleep(1000); | 3374 | Thread.Sleep(1000); |
3375 | loggingOffUser.ControllingClient.Close(true); | 3375 | loggingOffUser.ControllingClient.Close(); |
3376 | } | 3376 | } |
3377 | else | 3377 | else |
3378 | { | 3378 | { |
@@ -3543,7 +3543,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3543 | presence.ControllingClient.SendShutdownConnectionNotice(); | 3543 | presence.ControllingClient.SendShutdownConnectionNotice(); |
3544 | } | 3544 | } |
3545 | 3545 | ||
3546 | presence.ControllingClient.Close(true); | 3546 | presence.ControllingClient.Close(); |
3547 | return true; | 3547 | return true; |
3548 | } | 3548 | } |
3549 | 3549 | ||