16 files changed, 64 insertions, 61 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index a5150e6..fcb2493 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -64,8 +64,8 @@ namespace OpenSim
 

     public class OpenSimMain : RegionApplicationBase, conscmd_callback

     {

-      //  private CheckSumServer checkServer;

         protected CommunicationsManager commsManager;

+      //  private CheckSumServer checkServer;

 

         private bool m_silent;

         private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";

@@ -106,14 +106,12 @@ namespace OpenSim
 

             ClientView.TerrainManager = new TerrainManager(new SecondLife());

 

-            CommunicationsLocal sandboxCommunications = null;

             if (m_sandbox)

             {

                 this.SetupLocalGridServers();

               //  this.checkServer = new CheckSumServer(12036);

               //  this.checkServer.ServerListener();

-                sandboxCommunications = new CommunicationsLocal(this.serversData);

-                this.commsManager = sandboxCommunications;

+                this.commsManager = new CommunicationsLocal(this.serversData);

             }

             else

             {

@@ -136,7 +134,7 @@ namespace OpenSim
 

             if (m_sandbox)

             {

-                httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);

+                httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);

             }

 

             //Start http server

diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 1ed28d2..bb21365 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -114,9 +114,6 @@
     <Compile Include="LLSDType.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDHelpers.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="LLSDCapEvent.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -132,6 +129,9 @@
     <Compile Include="LLSDMapLayer.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="LLSDHelpers.cs">

+      <SubType>Code</SubType>

+    </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index dd853e7..817e5b0 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -17,12 +17,12 @@
                 <include name="LLSDTest.cs" />

                 <include name="LLSDUploadReply.cs" />

                 <include name="LLSDType.cs" />

-                <include name="LLSDHelpers.cs" />

                 <include name="LLSDCapEvent.cs" />

                 <include name="LLSDMapRequest.cs" />

                 <include name="Caps.cs" />

                 <include name="LLSDMapLayerResponse.cs" />

                 <include name="LLSDMapLayer.cs" />

+                <include name="LLSDHelpers.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 5e346fb..9650b42 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -68,6 +68,8 @@ namespace OpenSim.Region.ClientStack
         public event GenericCall6 OnRemoveAvatar;

         public event RequestMapBlocks OnRequestMapBlocks;

         public event TeleportLocationRequest OnTeleportLocationRequest;

+        

+        public event UUIDNameRequest OnNameFromUUIDRequest;

 

         public event ParcelPropertiesRequest OnParcelPropertiesRequest;

         public event ParcelDivideRequest OnParcelDivideRequest;

@@ -75,7 +77,6 @@ namespace OpenSim.Region.ClientStack
         public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;

 

         public event EstateOwnerMessageRequest OnEstateOwnerMessage;

-

         /// <summary>

         /// 

         /// </summary>

diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index cbd10dc..0456e3c 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -192,7 +192,5 @@ namespace OpenSim.Region.ClientStack
             this.OutPacket(mbReply);

              */

         }

-

-       

     }

 }

diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 51981b8..794ce79 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -492,7 +492,13 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.MoneyBalanceRequest:

                         this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);

                         break;

-

+                    case PacketType.UUIDNameRequest:

+                        UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;

+                        foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)

+                        {

+                            OnNameFromUUIDRequest(UUIDBlock.ID, this);

+                        }

+                        break;

                     #region Parcel related packets

                     case PacketType.ParcelPropertiesRequest:

                         ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;

diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 2e1d8e2..e679174 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -134,22 +134,22 @@
     <Compile Include="UDPServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.PacketHandlers.cs">

+    <Compile Include="ClientViewBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.API.cs">

+    <Compile Include="ClientView.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.ProcessPackets.cs">

+    <Compile Include="ClientView.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="RegionApplicationBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientViewBase.cs">

+    <Compile Include="ClientView.API.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.cs">

+    <Compile Include="ClientView.ProcessPackets.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Assets\InventoryCache.cs">

diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 1c791d3..95422c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -15,12 +15,12 @@
                 <include name="ClientStackNetworkHandler.cs" />

                 <include name="PacketServer.cs" />

                 <include name="UDPServer.cs" />

+                <include name="ClientViewBase.cs" />

+                <include name="ClientView.cs" />

                 <include name="ClientView.PacketHandlers.cs" />

+                <include name="RegionApplicationBase.cs" />

                 <include name="ClientView.API.cs" />

                 <include name="ClientView.ProcessPackets.cs" />

-                <include name="RegionApplicationBase.cs" />

-                <include name="ClientViewBase.cs" />

-                <include name="ClientView.cs" />

                 <include name="Assets/InventoryCache.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index f2b3b92..870f577 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Region.Communications.OGS1
         {

             GridServer = gridInterComms;

             InterRegion = gridInterComms;

-            UserServer = new OGSUserServices(this);

+            UserServer = new OGS1UserServices(this);

         }

     }

 }

diff --git a/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 51b33e9..51b33e9 100644
--- a/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 56a7837..856c447 100644
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -11,16 +11,22 @@ using Nwc.XmlRpc;
 

 namespace OpenSim.Region.Communications.OGS1

 {

-    public class OGSUserServices :IUserServices

+    public class OGS1UserServices :IUserServices

     {

         CommunicationsOGS1 m_parent;

-        public OGSUserServices(CommunicationsOGS1 parent)

+        public OGS1UserServices(CommunicationsOGS1 parent)

         {

             m_parent = parent;

         }

 

         public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)

         {

+            if (data.Contains("error_type"))

+            {

+                Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] + "): " + data["error_desc"]);

+                return null;

+            }

+

             UserProfileData userData = new UserProfileData();

             userData.username = (string)data["firstname"];

             userData.surname = (string)data["lastname"];

diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index b03ac7e..0a9e5fb 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,8 +6,7 @@
     <ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>

@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -61,31 +55,30 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libsecondlife.dll">

+    <Reference Include="libsecondlife.dll" >

       <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System">

+    <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data">

+    <Reference Include="System.Data" >

       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Runtime.Remoting">

+    <Reference Include="System.Runtime.Remoting" >

       <HintPath>System.Runtime.Remoting.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="XMLRPC.dll">

+    <Reference Include="XMLRPC.dll" >

       <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -95,35 +88,35 @@
       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">

       <Name>OpenSim.Framework.Communications</Name>

       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">

       <Name>OpenSim.Framework.Data</Name>

       <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">

       <Name>OpenSim.Framework.Servers</Name>

       <Project>{2CC71860-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="OGSInterSimComms.cs">

+    <Compile Include="OGS1InterSimComms.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="OGS1GridServices.cs">

@@ -132,7 +125,7 @@
     <Compile Include="CommunicationsOGS1.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OGSUserServices.cs">

+    <Compile Include="OGS1UserServices.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

@@ -146,4 +139,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 1a7cf69..2176b14 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="OGSInterSimComms.cs" />

+                <include name="OGS1InterSimComms.cs" />

                 <include name="OGS1GridServices.cs" />

-                <include name="GridCommsManager.cs" />

-                <include name="OGSUserServices.cs" />

+                <include name="CommunicationsOGS1.cs" />

+                <include name="OGS1UserServices.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

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

             {