*Added UUIDNameRequest packet support (untested, but should work -- at least in sandbox mode)

*Various small renamings

4 files changed, 25 insertions, 3 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 69b5da6..b17b37b 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -30,9 +30,11 @@ using System.Collections;
 using System.Collections.Generic;

 using System.Text;

 using OpenSim.Framework;

+using OpenSim.Framework.Data;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 using libsecondlife;

+using libsecondlife.Packets;

 

 namespace OpenSim.Framework.Communications

 {

@@ -48,5 +50,21 @@ namespace OpenSim.Framework.Communications
         {

             ServersInfo = serversInfo;

         }

+

+        #region Packet Handlers

+        public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)

+        {

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

+            if (profileData != null)

+            {

+                UUIDNameReplyPacket packet = new UUIDNameReplyPacket();

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

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

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

+                remote_client.OutPacket((Packet)packet);

+            }

+            

+        }

+        #endregion

     }

 }

diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 009648c..4e8ac1a 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -69,6 +69,8 @@ namespace OpenSim.Framework.Interfaces
 

     public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);

 

+    public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);

+

     public interface IClientAPI

     {

         event ChatFromViewer OnChatFromViewer;

@@ -103,6 +105,8 @@ namespace OpenSim.Framework.Interfaces
         event NewAvatar OnNewAvatar;

         event GenericCall6 OnRemoveAvatar;

 

+        event UUIDNameRequest OnNameFromUUIDRequest;

+

         event ParcelPropertiesRequest OnParcelPropertiesRequest;

         event ParcelDivideRequest OnParcelDivideRequest;

         event ParcelJoinRequest OnParcelJoinRequest;

diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 261b96b..fbbf568 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -133,10 +133,10 @@
     <Compile Include="Interfaces\IWorld.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IClientAPI.cs">

+    <Compile Include="Interfaces\ILocalStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\ILocalStorage.cs">

+    <Compile Include="Interfaces\IClientAPI.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\Config\IGenericConfig.cs">

diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index f05217f..f81737d 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -26,8 +26,8 @@
                 <include name="Interfaces/IUserServer.cs" />

                 <include name="Interfaces/IAssetServer.cs" />

                 <include name="Interfaces/IWorld.cs" />

-                <include name="Interfaces/IClientAPI.cs" />

                 <include name="Interfaces/ILocalStorage.cs" />

+                <include name="Interfaces/IClientAPI.cs" />

                 <include name="Interfaces/Config/IGenericConfig.cs" />

                 <include name="Interfaces/Config/IUserConfig.cs" />

                 <include name="Interfaces/Config/IGridConfig.cs" />