aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP/PacketHandler
diff options
context:
space:
mode:
authorHomer Horwitz2009-03-16 21:41:51 +0000
committerHomer Horwitz2009-03-16 21:41:51 +0000
commit66f04451735a9473d80d40abdbabb9b9d1ed8b7d (patch)
tree3e6618271bcf938fbb86e28d544a589bddaa3b81 /OpenSim/Client/MXP/PacketHandler
parentRemove OpenSim/Framework/Archive folder (diff)
downloadopensim-SC_OLD-66f04451735a9473d80d40abdbabb9b9d1ed8b7d.zip
opensim-SC_OLD-66f04451735a9473d80d40abdbabb9b9d1ed8b7d.tar.gz
opensim-SC_OLD-66f04451735a9473d80d40abdbabb9b9d1ed8b7d.tar.bz2
opensim-SC_OLD-66f04451735a9473d80d40abdbabb9b9d1ed8b7d.tar.xz
Mantis#3306: Thanks tlaukkan for a patch that
adds primitive hierarchies support to MXP and improves client disconnect handling.
Diffstat (limited to 'OpenSim/Client/MXP/PacketHandler')
-rw-r--r--OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
index bb04955..ec9f8e1 100644
--- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
+++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
@@ -233,6 +233,7 @@ namespace OpenSim.Client.MXP.PacketHandler
233 233
234 foreach (MXPClientView clientView in m_sessionsToRemove) 234 foreach (MXPClientView clientView in m_sessionsToRemove)
235 { 235 {
236 clientView.Scene.RemoveClient(clientView.AgentId);
236 clientView.OnClean(); 237 clientView.OnClean();
237 m_clients.Remove(clientView); 238 m_clients.Remove(clientView);
238 m_sessions.Remove(clientView.Session); 239 m_sessions.Remove(clientView.Session);
@@ -393,7 +394,7 @@ namespace OpenSim.Client.MXP.PacketHandler
393 } 394 }
394 395
395 m_log.Info("[MXP ClientStack] Removing Client from Scene"); 396 m_log.Info("[MXP ClientStack] Removing Client from Scene");
396 clientView.Scene.RemoveClient(clientView.AgentId); 397 //clientView.Scene.RemoveClient(clientView.AgentId);
397 } 398 }
398 if (message.GetType() == typeof(LeaveResponseMessage)) 399 if (message.GetType() == typeof(LeaveResponseMessage))
399 { 400 {
@@ -407,7 +408,7 @@ namespace OpenSim.Client.MXP.PacketHandler
407 } 408 }
408 409
409 m_log.Info("[MXP ClientStack] Removing Client from Scene"); 410 m_log.Info("[MXP ClientStack] Removing Client from Scene");
410 clientView.Scene.RemoveClient(clientView.AgentId); 411 //clientView.Scene.RemoveClient(clientView.AgentId);
411 } 412 }
412 else 413 else
413 { 414 {
@@ -490,6 +491,7 @@ namespace OpenSim.Client.MXP.PacketHandler
490 lastName = nameParts[1]; 491 lastName = nameParts[1];
491 492
492 userProfile = m_scenes[sceneId].CommsManager.UserService.GetUserProfile(firstName, lastName); 493 userProfile = m_scenes[sceneId].CommsManager.UserService.GetUserProfile(firstName, lastName);
494
493 if (userProfile == null && !m_accountsAuthenticate) 495 if (userProfile == null && !m_accountsAuthenticate)
494 { 496 {
495 userId = ((UserManagerBase)m_scenes[sceneId].CommsManager.UserService).AddUser(firstName, lastName, "test", "", 1000, 1000); 497 userId = ((UserManagerBase)m_scenes[sceneId].CommsManager.UserService).AddUser(firstName, lastName, "test", "", 1000, 1000);
@@ -498,7 +500,7 @@ namespace OpenSim.Client.MXP.PacketHandler
498 { 500 {
499 if (userProfile == null) 501 if (userProfile == null)
500 { 502 {
501 m_log.Info("Login failed as user was not found: " + participantName); 503 m_log.Info("[MXP ClientStack] Login failed as user was not found: " + participantName);
502 return false; 504 return false;
503 } 505 }
504 userId = userProfile.ID; 506 userId = userProfile.ID;