aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
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/Client
parent* Fixed a bug where clients were being added to ClientManager twice (diff)
downloadopensim-SC_OLD-dc11643c007adf7a640ec4fbabe25995352aaa18.zip
opensim-SC_OLD-dc11643c007adf7a640ec4fbabe25995352aaa18.tar.gz
opensim-SC_OLD-dc11643c007adf7a640ec4fbabe25995352aaa18.tar.bz2
opensim-SC_OLD-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 '')
-rw-r--r--OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs6
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs5
2 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
index d5dc18f..ba9c653 100644
--- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
+++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
@@ -339,12 +339,6 @@ namespace OpenSim.Client.MXP.PacketHandler
339 m_clients.Add(client); 339 m_clients.Add(client);
340 m_log.Debug("[MXP ClientStack]: Created ClientView."); 340 m_log.Debug("[MXP ClientStack]: Created ClientView.");
341 341
342
343 m_log.Debug("[MXP ClientStack]: Adding ClientView to Scene...");
344 scene.ClientManager.Add(client.AgentId, client.RemoteEndPoint, client);
345 m_log.Debug("[MXP ClientStack]: Added ClientView to Scene.");
346
347
348 client.MXPSendSynchronizationBegin(m_scenes[new UUID(joinRequestMessage.BubbleId)].SceneContents.GetTotalObjectsCount()); 342 client.MXPSendSynchronizationBegin(m_scenes[new UUID(joinRequestMessage.BubbleId)].SceneContents.GetTotalObjectsCount());
349 343
350 m_log.Debug("[MXP ClientStack]: Starting ClientView..."); 344 m_log.Debug("[MXP ClientStack]: Starting ClientView...");
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 9c24da5..e3abcf5 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -207,6 +207,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
207 get { throw new System.NotImplementedException(); } 207 get { throw new System.NotImplementedException(); }
208 } 208 }
209 209
210 public IPEndPoint RemoteEndPoint
211 {
212 get { throw new System.NotImplementedException(); }
213 }
214
210 public event GenericMessage OnGenericMessage = delegate { }; 215 public event GenericMessage OnGenericMessage = delegate { };
211 public event ImprovedInstantMessage OnInstantMessage = delegate { }; 216 public event ImprovedInstantMessage OnInstantMessage = delegate { };
212 public event ChatMessage OnChatFromClient = delegate { }; 217 public event ChatMessage OnChatFromClient = delegate { };