aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-13 14:50:03 -0700
committerJohn Hurliman2009-10-13 14:50:03 -0700
commit23a334b9f54a1ef5df3b503c165e7b76b746a2b1 (patch)
tree93003db47fcd77af4085c0c49cbc1f2f0293b5eb /OpenSim/Region/Framework/Scenes/Scene.cs
parent* Unregister event handlers in LLUDPServer when a client logs out and disconn... (diff)
downloadopensim-SC-23a334b9f54a1ef5df3b503c165e7b76b746a2b1.zip
opensim-SC-23a334b9f54a1ef5df3b503c165e7b76b746a2b1.tar.gz
opensim-SC-23a334b9f54a1ef5df3b503c165e7b76b746a2b1.tar.bz2
opensim-SC-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 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 3 insertions, 3 deletions
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