Started change to having SceneObject and then that having child Primitives which in turn have a Shape object (currently PrimitiveBaseShape). The plan is only for the SceneObject to interface with the physics engines. As a physics Entity should be able to have mulitple shapes connected to it.

1 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index b17b37b..48ff40e 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -54,13 +54,16 @@ namespace OpenSim.Framework.Communications
         #region Packet Handlers

         public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)

         {

+            System.Text.Encoding enc = System.Text.Encoding.ASCII;

             UserProfileData profileData = this.UserServer.GetUserProfile(uuid);

             if (profileData != null)

             {

                 UUIDNameReplyPacket packet = new UUIDNameReplyPacket();

+                packet.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[1];

+                packet.UUIDNameBlock[0] = new UUIDNameReplyPacket.UUIDNameBlockBlock();

                 packet.UUIDNameBlock[0].ID = profileData.UUID;

-                packet.UUIDNameBlock[0].FirstName = libsecondlife.Helpers.StringToField(profileData.username);

-                packet.UUIDNameBlock[0].LastName = libsecondlife.Helpers.StringToField(profileData.surname);

+                packet.UUIDNameBlock[0].FirstName = enc.GetBytes(profileData.username + "\0");

+                packet.UUIDNameBlock[0].LastName = enc.GetBytes(profileData.surname +"\0");

                 remote_client.OutPacket((Packet)packet);

             }