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

*Various small renamings

3 files changed, 6 insertions, 5 deletions

diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 9f8d2c3..0cfeda9 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -163,9 +163,6 @@
     <Compile Include="Scenes\SceneEvents.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Scenes\ScenePresence.Animations.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -187,6 +184,9 @@
     <Compile Include="Scenes\SceneBase.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Scenes\ScenePresence.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Scenes\Scene.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 667f1d7..fcfc623 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -16,7 +16,6 @@
                 <include name="ParcelManager.cs" />

                 <include name="Scenes/ScenePresence.Body.cs" />

                 <include name="Scenes/SceneEvents.cs" />

-                <include name="Scenes/ScenePresence.cs" />

                 <include name="Scenes/ScenePresence.Animations.cs" />

                 <include name="Scenes/Scene.PacketHandlers.cs" />

                 <include name="Scenes/SceneObject.cs" />

@@ -24,6 +23,7 @@
                 <include name="Scenes/IScenePresenceBody.cs" />

                 <include name="Scenes/Entity.cs" />

                 <include name="Scenes/SceneBase.cs" />

+                <include name="Scenes/ScenePresence.cs" />

                 <include name="Scenes/Scene.cs" />

                 <include name="Scenes/scripting/ScriptManager.cs" />

                 <include name="Scenes/scripting/ScriptInfo.cs" />

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f1de803..8c912d0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -505,6 +505,7 @@ namespace OpenSim.Region.Environment.Scenes
             remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;

            //remoteClient.OnObjectSelect += this.SelectPrim;

             remoteClient.OnGrapUpdate += this.MoveObject;

+            remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;

 

             /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);

             remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);

@@ -512,7 +513,7 @@ namespace OpenSim.Region.Environment.Scenes
             remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);

             remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);

             */

-

+            

             ScenePresence newAvatar = null;

             try

             {