aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-13 17:33:45 -0700
committerJohn Hurliman2009-10-13 17:33:45 -0700
commitdc11643c007adf7a640ec4fbabe25995352aaa18 (patch)
tree108b5f7234756c5395d4ca518cfeb03454f62ace /OpenSim/Region/Framework
parent* Fixed a bug where clients were being added to ClientManager twice (diff)
downloadopensim-SC-dc11643c007adf7a640ec4fbabe25995352aaa18.zip
opensim-SC-dc11643c007adf7a640ec4fbabe25995352aaa18.tar.gz
opensim-SC-dc11643c007adf7a640ec4fbabe25995352aaa18.tar.bz2
opensim-SC-dc11643c007adf7a640ec4fbabe25995352aaa18.tar.xz
* Consolidated adding / removing ClientManager IClientAPIs to two places in Scene
* Added some missing implementations of IClientAPI.RemoteEndPoint * Added a ClientManager.Remove(UUID) overload * Removed a reference to a missing project from prebuild.xml
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index bb71896..7944548 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2363,6 +2363,8 @@ namespace OpenSim.Region.Framework.Scenes
2363 /// <param name="client"></param> 2363 /// <param name="client"></param>
2364 public override void AddNewClient(IClientAPI client) 2364 public override void AddNewClient(IClientAPI client)
2365 { 2365 {
2366 ClientManager.Add(client);
2367
2366 CheckHeartbeat(); 2368 CheckHeartbeat();
2367 SubscribeToClientEvents(client); 2369 SubscribeToClientEvents(client);
2368 ScenePresence presence; 2370 ScenePresence presence;
@@ -3002,7 +3004,9 @@ namespace OpenSim.Region.Framework.Scenes
3002 agentTransactions.RemoveAgentAssetTransactions(agentID); 3004 agentTransactions.RemoveAgentAssetTransactions(agentID);
3003 } 3005 }
3004 3006
3007 // Remove the avatar from the scene
3005 m_sceneGraph.RemoveScenePresence(agentID); 3008 m_sceneGraph.RemoveScenePresence(agentID);
3009 ClientManager.Remove(agentID);
3006 3010
3007 try 3011 try
3008 { 3012 {