Mantis#3306: Thanks tlaukkan for a patch that

adds primitive hierarchies support to MXP and improves client disconnect handling.

2 files changed, 20 insertions, 10 deletions

diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 5a7accf..30820d3 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -42,6 +42,7 @@ using MXP.Extentions.OpenMetaverseFragments.Proto;
 using MXP.Util;
 using MXP.Fragments;
 using MXP.Common.Proto;
+using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Client.MXP.ClientStack
 {
@@ -303,11 +304,18 @@ namespace OpenSim.Client.MXP.ClientStack
             String typeName = ToOmType(primShape.PCode);
             m_log.Info("[MXP ClientStack] Transmitting Primitive" + typeName);
 
-            PerceptionEventMessage pe = new PerceptionEventMessage();
-
+            PerceptionEventMessage pe = new PerceptionEventMessage();           
             pe.ObjectFragment.ObjectId = objectID.Guid;
-            // TODO Resolve ParentID
+
             pe.ObjectFragment.ParentObjectId = Guid.Empty;
+
+            // Resolving parent UUID.
+            OpenSim.Region.Framework.Scenes.Scene scene = (OpenSim.Region.Framework.Scenes.Scene)Scene;
+            if (scene.Entities.ContainsKey(parentID))
+            {
+                pe.ObjectFragment.ParentObjectId = scene.Entities[parentID].UUID.Guid;
+            }
+
             pe.ObjectFragment.ObjectIndex = localID;
             pe.ObjectFragment.ObjectName = typeName + " Object";
             pe.ObjectFragment.OwnerId = ownerID.Guid;
@@ -387,7 +395,6 @@ namespace OpenSim.Client.MXP.ClientStack
             PerceptionEventMessage pe = new PerceptionEventMessage();
 
             pe.ObjectFragment.ObjectId = avatarID.Guid;
-            // TODO Resolve ParentID
             pe.ObjectFragment.ParentObjectId = parentId.Guid;
             pe.ObjectFragment.ObjectIndex = avatarLocalID;
             pe.ObjectFragment.ObjectName = participantName;
@@ -397,7 +404,8 @@ namespace OpenSim.Client.MXP.ClientStack
             pe.ObjectFragment.Acceleration = new MsdVector3f();
             pe.ObjectFragment.AngularAcceleration = new MsdQuaternion4f();
             pe.ObjectFragment.AngularVelocity = new MsdQuaternion4f();
-            pe.ObjectFragment.BoundingSphereRadius = 1; // TODO Fill in appropriate value
+
+            pe.ObjectFragment.BoundingSphereRadius = 1.0f; // TODO Fill in appropriate value
 
             pe.ObjectFragment.Location = ToOmVector(position);
 
@@ -425,11 +433,11 @@ namespace OpenSim.Client.MXP.ClientStack
             pe.ObjectFragment.Acceleration = new MsdVector3f();
             pe.ObjectFragment.AngularAcceleration = new MsdQuaternion4f();
             pe.ObjectFragment.AngularVelocity = new MsdQuaternion4f();
-            pe.ObjectFragment.BoundingSphereRadius = 1; // TODO Fill in appropriate value
+            pe.ObjectFragment.BoundingSphereRadius = 128f;
 
             pe.ObjectFragment.Location = new MsdVector3f();
 
-            pe.ObjectFragment.Mass = 1.0f; // TODO Fill in appropriate value
+            pe.ObjectFragment.Mass = 1.0f;
             pe.ObjectFragment.Orientation = new MsdQuaternion4f();
             pe.ObjectFragment.Velocity = new MsdVector3f();
 
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
 
             foreach (MXPClientView clientView in m_sessionsToRemove)
             {
+                clientView.Scene.RemoveClient(clientView.AgentId);
                 clientView.OnClean();
                 m_clients.Remove(clientView);
                 m_sessions.Remove(clientView.Session);
@@ -393,7 +394,7 @@ namespace OpenSim.Client.MXP.PacketHandler
                         }
 
                         m_log.Info("[MXP ClientStack] Removing Client from Scene");
-                        clientView.Scene.RemoveClient(clientView.AgentId);
+                        //clientView.Scene.RemoveClient(clientView.AgentId);
                     }
                     if (message.GetType() == typeof(LeaveResponseMessage))
                     {
@@ -407,7 +408,7 @@ namespace OpenSim.Client.MXP.PacketHandler
                         }
 
                         m_log.Info("[MXP ClientStack] Removing Client from Scene");
-                        clientView.Scene.RemoveClient(clientView.AgentId);
+                        //clientView.Scene.RemoveClient(clientView.AgentId);
                     }
                     else
                     {
@@ -490,6 +491,7 @@ namespace OpenSim.Client.MXP.PacketHandler
             lastName = nameParts[1];
 
             userProfile = m_scenes[sceneId].CommsManager.UserService.GetUserProfile(firstName, lastName);
+
             if (userProfile == null && !m_accountsAuthenticate)
             {
                 userId = ((UserManagerBase)m_scenes[sceneId].CommsManager.UserService).AddUser(firstName, lastName, "test", "", 1000, 1000);
@@ -498,7 +500,7 @@ namespace OpenSim.Client.MXP.PacketHandler
             {
                 if (userProfile == null)
                 {
-                    m_log.Info("Login failed as user was not found: " + participantName);
+                    m_log.Info("[MXP ClientStack] Login failed as user was not found: " + participantName);
                     return false;
                 }
                 userId = userProfile.ID;