36 files changed, 261 insertions, 266 deletions

diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 31ab172..0ee62e9 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,16 +86,16 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="CommunicationsManager.cs">

+    <Compile Include="IUserServices.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="IGridServices.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IInterRegionCommunications.cs">

+    <Compile Include="CommunicationsManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IUserServices.cs">

+    <Compile Include="IInterRegionCommunications.cs">

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 52d29f6..8b0e0f6 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

                 <include name="IGridServices.cs" />

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

                 <include name="IInterRegionCommunications.cs" />

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

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

             </sources>

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

diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index f3dcec5..c02a506 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -69,10 +69,10 @@
     <Compile Include="AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ConsoleCallbacksBase.cs">

+    <Compile Include="LogBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LogBase.cs">

+    <Compile Include="ConsoleCallbacksBase.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="MainLog.cs">

diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index eb40c0d..10e72a1 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -12,8 +12,8 @@
             </resources>

             <sources failonempty="true">

                 <include name="AssemblyInfo.cs" />

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

                 <include name="LogBase.cs" />

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

                 <include name="MainLog.cs" />

             </sources>

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

diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index b09cecf..c7b4870 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="DB4oGridData.cs">

+    <Compile Include="DB4oUserData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="DB4oManager.cs">

+    <Compile Include="DB4oGridData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="DB4oUserData.cs">

+    <Compile Include="DB4oManager.cs">

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index f124eb5..efccdc1 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="DB4oGridData.cs" />

                 <include name="DB4oManager.cs" />

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

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

             </sources>

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

diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 62e3887..09a32b5 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="MySQLGridData.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="MySQLInventoryData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MySQLLogData.cs">

+    <Compile Include="MySQLUserData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="MySQLManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MySQLUserData.cs">

+    <Compile Include="MySQLLogData.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="MySQLGridData.cs">

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index 594ec52..3aeebbc 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="MySQLInventoryData.cs" />

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

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

                 <include name="MySQLUserData.cs" />

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

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

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

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

             </sources>

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

diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index 4ba24f1..dab22ea 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="SQLiteGridData.cs">

+    <Compile Include="SQLiteManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SQLiteManager.cs">

+    <Compile Include="SQLiteGridData.cs">

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index e28d0a6..719fbc6 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="SQLiteManager.cs" />

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

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

             </sources>

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

diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index dcafbcd..6077266 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.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,7 +6,8 @@
     <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework.Data</AssemblyName>

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

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Framework.Data</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

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

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

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

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

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

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,29 +61,34 @@
     <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.Xml" >

+    <Reference Include="System.Xml">

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

       <Private>False</Private>

     </Reference>

+    <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" />

   </ItemGroup>

   <ItemGroup>

   </ItemGroup>

   <ItemGroup>

+    <Compile Include="ReservationData.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="GridData.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -90,18 +101,15 @@
     <Compile Include="InventoryData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ReservationData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="SimProfileData.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="UserData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="UserProfileData.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="SimProfileData.cs">

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

@@ -113,4 +121,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index aefb02b..6b489f2 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -11,14 +11,14 @@
             <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="GridData.cs" />

                 <include name="ILogData.cs" />

                 <include name="IniConfig.cs" />

                 <include name="InventoryData.cs" />

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

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

                 <include name="UserData.cs" />

                 <include name="UserProfileData.cs" />

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

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

             </sources>

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

diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index 3dddfb4..9db8574 100644
--- a/OpenSim/Framework/Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -26,6 +26,10 @@
 * 

 */

 using libsecondlife;

+using Nwc.XmlRpc;

+

+using System;

+using System.Collections;

 

 namespace OpenSim.Framework.Data

 {

@@ -108,5 +112,71 @@ namespace OpenSim.Framework.Data
         /// Region Map Texture Asset

         /// </summary>

         public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006");

+

+        /// <summary>

+        /// Get Sim profile data from grid server when in grid mode

+        /// </summary>

+        /// <param name="region_uuid"></param>

+        /// <param name="gridserver_url"></param>

+        /// <param name="?"></param>

+        /// <returns></returns>

+        public SimProfileData RequestSimProfileData(LLUUID region_uuid, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)

+        {

+            Hashtable requestData = new Hashtable();

+            requestData["region_uuid"] = region_uuid.UUID.ToString();

+            requestData["authkey"] = gridserver_sendkey;

+            ArrayList SendParams = new ArrayList();

+            SendParams.Add(requestData);

+            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);

+            XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);

+

+            Hashtable responseData = (Hashtable)GridResp.Value;

+

+            if (responseData.ContainsKey("error"))

+            {

+                return null;

+            }

+

+            SimProfileData simData = new SimProfileData();

+            simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);

+            simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);

+            simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));

+            simData.serverIP = (string)responseData["sim_ip"];

+            simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);

+            simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";

+            simData.UUID = new LLUUID((string)responseData["region_UUID"]);

+            simData.regionName = (string)responseData["region_name"];

+

+            return simData;            

+        }

+        public SimProfileData RequestSimProfileData(ulong region_handle, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)

+        {

+            Hashtable requestData = new Hashtable();

+            requestData["region_handle"] = region_handle.ToString();

+            requestData["authkey"] = gridserver_sendkey;

+            ArrayList SendParams = new ArrayList();

+            SendParams.Add(requestData);

+            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);

+            XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);

+

+            Hashtable responseData = (Hashtable)GridResp.Value;

+

+            if (responseData.ContainsKey("error"))

+            {

+                return null;

+            }

+

+            SimProfileData simData = new SimProfileData();

+            simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);

+            simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);

+            simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));

+            simData.serverIP = (string)responseData["sim_ip"];

+            simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);

+            simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";

+            simData.UUID = new LLUUID((string)responseData["region_UUID"]);

+            simData.regionName = (string)responseData["region_name"];

+

+            return simData; 

+        }

     }

 }

diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index a577ea3..4a72db0 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -97,103 +97,100 @@
     <Compile Include="BlockingQueue.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IRegionCommsListener.cs">

+    <Compile Include="Util.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LoginService.cs">

+    <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionCommsListener.cs">

+    <Compile Include="IRegionCommsListener.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Remoting.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimProfile.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UserProfile.cs">

+    <Compile Include="RegionCommsListener.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Util.cs">

+    <Compile Include="LoginService.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\AuthenticateResponse.cs">

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Config\IGridConfig.cs">

+    <Compile Include="Interfaces\Config\IUserConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Config\IUserConfig.cs">

+    <Compile Include="Interfaces\Config\IGridConfig.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="Types\MapBlockData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AgentCiruitData.cs">

+    <Compile Include="Types\PrimitiveBaseShape.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AgentWearable.cs">

+    <Compile Include="Types\AssetLandmark.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetBase.cs">

+    <Compile Include="Types\NeighbourInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetLandmark.cs">

+    <Compile Include="Types\RegionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetStorage.cs">

+    <Compile Include="Types\RegionHandle.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\EstateSettings.cs">

+    <Compile Include="Types\ParcelData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\Login.cs">

+    <Compile Include="Types\PrimData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\MapBlockData.cs">

+    <Compile Include="Types\AgentWearable.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\NeighbourInfo.cs">

+    <Compile Include="Types\AssetStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\NetworkServersInfo.cs">

+    <Compile Include="Types\UUID.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\ParcelData.cs">

+    <Compile Include="Types\EstateSettings.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\PrimData.cs">

+    <Compile Include="Types\Login.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\PrimitiveBaseShape.cs">

+    <Compile Include="Types\AgentCiruitData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\RegionHandle.cs">

+    <Compile Include="Types\AssetBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\RegionInfo.cs">

+    <Compile Include="Types\NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\UUID.cs">

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

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index 10fafbf..9fb35bc 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -14,39 +14,38 @@
                 <include name="AgentInventory.cs" />

                 <include name="AuthenticateSessionBase.cs" />

                 <include name="BlockingQueue.cs" />

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

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

                 <include name="IRegionCommsListener.cs" />

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

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

                 <include name="Remoting.cs" />

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

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

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

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

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

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

+                <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/IUserServer.cs" />

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

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

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

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

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

-                <include name="Types/AgentCiruitData.cs" />

-                <include name="Types/AgentWearable.cs" />

-                <include name="Types/AssetBase.cs" />

-                <include name="Types/AssetLandmark.cs" />

-                <include name="Types/AssetStorage.cs" />

-                <include name="Types/EstateSettings.cs" />

-                <include name="Types/Login.cs" />

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

                 <include name="Types/MapBlockData.cs" />

+                <include name="Types/PrimitiveBaseShape.cs" />

+                <include name="Types/AssetLandmark.cs" />

                 <include name="Types/NeighbourInfo.cs" />

-                <include name="Types/NetworkServersInfo.cs" />

+                <include name="Types/RegionInfo.cs" />

+                <include name="Types/RegionHandle.cs" />

                 <include name="Types/ParcelData.cs" />

                 <include name="Types/PrimData.cs" />

-                <include name="Types/PrimitiveBaseShape.cs" />

-                <include name="Types/RegionHandle.cs" />

-                <include name="Types/RegionInfo.cs" />

+                <include name="Types/AgentWearable.cs" />

+                <include name="Types/AssetStorage.cs" />

                 <include name="Types/UUID.cs" />

+                <include name="Types/EstateSettings.cs" />

+                <include name="Types/Login.cs" />

+                <include name="Types/AgentCiruitData.cs" />

+                <include name="Types/AssetBase.cs" />

+                <include name="Types/NetworkServersInfo.cs" />

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

             </sources>

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

                 <lib>

diff --git a/OpenSim/Framework/General/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
deleted file mode 100644
index 47f1af3..0000000
--- a/OpenSim/Framework/General/SimProfile.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections;

-using libsecondlife;

-using Nwc.XmlRpc;

-

-namespace OpenSim.Framework.Sims

-{

-    public class SimProfile

-    {

-        public LLUUID UUID;

-        public ulong regionhandle;

-        public string regionname;

-        public string sim_ip;

-        public uint sim_port;

-        public string caps_url;

-        public uint RegionLocX;

-        public uint RegionLocY;

-        public string sendkey;

-        public string recvkey;

-        public bool online;

-

-        public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey)

-        {

-            try

-            {

-                Hashtable GridReqParams = new Hashtable();

-                GridReqParams["region_handle"] = region_handle.ToString();

-                GridReqParams["authkey"] = SendKey;

-                ArrayList SendParams = new ArrayList();

-                SendParams.Add(GridReqParams);

-                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);

-

-                XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);

-

-                Hashtable RespData = (Hashtable)GridResp.Value;

-                this.UUID = new LLUUID((string)RespData["UUID"]);

-                this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));

-                this.regionname = (string)RespData["regionname"];

-                this.sim_ip = (string)RespData["sim_ip"];

-                this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);

-                this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";

-                this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);

-                this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);

-                this.sendkey = SendKey;

-                this.recvkey = RecvKey;

-            }

-            catch (Exception e)

-            {

-                System.Console.WriteLine(e.ToString());

-            }

-            return this;

-        }

-

-        public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)

-        {

-            try

-            {

-                Hashtable GridReqParams = new Hashtable();

-                GridReqParams["UUID"] = UUID.ToString();

-                GridReqParams["authkey"] = SendKey;

-                ArrayList SendParams = new ArrayList();

-                SendParams.Add(GridReqParams);

-                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);

-

-                XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);

-

-                Hashtable RespData = (Hashtable)GridResp.Value;

-                this.UUID = new LLUUID((string)RespData["UUID"]);

-                this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));

-                this.regionname = (string)RespData["regionname"];

-                this.sim_ip = (string)RespData["sim_ip"];

-                this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);

-                this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";

-                this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);

-                this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);

-                this.sendkey = SendKey;

-                this.recvkey = RecvKey;

-            }

-            catch (Exception e)

-            {

-                System.Console.WriteLine(e.ToString());

-            }

-            return this;

-        }

-

-

-        public SimProfile()

-        {

-        }

-    }

-

-}

diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index f316cc7..af5feac 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -357,6 +357,8 @@ namespace OpenSim.Framework.UserManagement
         /// <returns>The response to send</returns>

         public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)

         {

+

+            System.Console.WriteLine("Attempting login now...");

             XmlRpcResponse response = new XmlRpcResponse();

             Hashtable requestData = (Hashtable)request.Params[0];

 

@@ -457,11 +459,13 @@ namespace OpenSim.Framework.UserManagement
                     {

                         System.Console.WriteLine(e.ToString());

                         return logResponse.CreateDeadRegionResponse();

+                        //return logResponse.ToXmlRpcResponse();

                     }

                     CommitAgent(ref userProfile);

                     return logResponse.ToXmlRpcResponse();

 

                 }

+                

                 catch (Exception E)

                 {

                     System.Console.WriteLine(E.ToString());

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 1e457b3..422385d 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -268,6 +268,7 @@ namespace OpenSim.Grid.GridServer
                 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));

                 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";

 

+                Console.WriteLine("NEW SIM: " + TheSim.serverURI);

                 TheSim.regionName = (string)requestData["sim_name"];

                 TheSim.UUID = new LLUUID((string)requestData["UUID"]);

 

@@ -376,6 +377,40 @@ namespace OpenSim.Grid.GridServer
         return response;

         }

 

+        public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request)

+        {

+            Hashtable requestData = (Hashtable)request.Params[0];

+            Hashtable responseData = new Hashtable();

+            SimProfileData simData = null;

+            if (requestData.ContainsKey("region_UUID"))

+            {

+                simData = getRegion(new LLUUID((string)requestData["region_UUID"]));

+            }

+            else if (requestData.ContainsKey("region_handle"))

+            {

+                simData = getRegion(Convert.ToUInt64((string)requestData["region_handle"]));

+            }

+

+            if (simData == null)

+            {

+                //Sim does not exist

+                responseData["error"] = "Sim does not exist";

+            }

+            else

+            {

+                responseData["sim_ip"] = simData.serverIP;

+                responseData["sim_port"] = simData.serverPort.ToString();

+                responseData["region_locx"] = simData.regionLocX;

+                responseData["region_locy"] = simData.regionLocY;

+                responseData["region_UUID"] = simData.UUID.UUID.ToString();

+                responseData["region_name"] = simData.regionName;

+            }

+

+            XmlRpcResponse response = new XmlRpcResponse();

+            response.Value = responseData;

+            return response;

+        }

+

         public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request)

         {

             int xmin=980, ymin=980, xmax=1020, ymax=1020;

diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index a990ff7..dc5e4fa 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -125,6 +125,7 @@ namespace OpenSim.Grid.GridServer
             //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);

 

             httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);

+            httpServer.AddXmlRPCHandler("simulator_data_request", m_gridManager.XmlRpcSimulatorDataRequestMethod);

             httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);

 

             httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod ));

diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
index 424072e..7fbb581 100644
--- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
@@ -114,10 +114,10 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="GridManager.cs">

+    <Compile Include="Main.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Main.cs">

+    <Compile Include="GridManager.cs">

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
index 4cadf1d..45cf353 100644
--- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="Main.cs" />

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

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

             </sources>

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

diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 4610a9d..4216515 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections;

 using Nwc.XmlRpc;

 using OpenSim.Framework.Data;

-using OpenSim.Framework.Sims;

 using OpenSim.Framework.UserManagement;

 

 namespace OpenSim.Grid.UserServer

@@ -48,23 +47,23 @@ namespace OpenSim.Grid.UserServer
         public override void CustomiseResponse(  LoginResponse response,   UserProfileData theUser)

         {

             // Load information from the gridserver

-            SimProfile SimInfo = new SimProfile();

-            SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);

+            SimProfileData SimInfo = new SimProfileData();

+            SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);

 

             // Customise the response

             // Home Location

-            response.Home = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " +

+            response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " +

                 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +

                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";

 

             // Destination

-            response.SimAddress = SimInfo.sim_ip;

-            response.SimPort = (Int32)SimInfo.sim_port;

-            response.RegionX = SimInfo.RegionLocY ;

-            response.RegionY = SimInfo.RegionLocX ;

+            response.SimAddress = SimInfo.serverIP;

+            response.SimPort = (Int32)SimInfo.serverPort;

+            response.RegionX = SimInfo.regionLocX;

+            response.RegionY = SimInfo.regionLocX;

 

             // Notify the target of an incoming user

-            Console.WriteLine("Notifying " + SimInfo.regionname + " (" + SimInfo.caps_url + ")");

+            Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI+ ")");

 

             // Prepare notification

             Hashtable SimParams = new Hashtable();

@@ -83,11 +82,11 @@ namespace OpenSim.Grid.UserServer
 

             // Update agent with target sim

             theUser.currentAgent.currentRegion = SimInfo.UUID;

-            theUser.currentAgent.currentHandle = SimInfo.regionhandle;

+            theUser.currentAgent.currentHandle = SimInfo.regionHandle;

 

             // Send

             XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);

-            XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000);

+            XmlRpcResponse GridResp = GridReq.Send(SimInfo.serverURI, 3000);

         }

     }

 }

diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index bec85cc..f5da23d 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -170,13 +170,13 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Application.cs">

+    <Compile Include="VersionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OpenSimMain.cs">

+    <Compile Include="Application.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="VersionInfo.cs">

+    <Compile Include="OpenSimMain.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 6c7d7ac..9890cfa 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="Application.cs" />

                 <include name="OpenSimMain.cs" />

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

             </sources>

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

                 <lib>

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e2486bd..c5c9efc 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -481,4 +481,4 @@ namespace OpenSim
     }

 

 

-}
\ No newline at end of file
+}

diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 3093eb0..2e1d8e2 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="ClientStackNetworkHandler.cs">

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

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="ClientStackNetworkHandler.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="PacketServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.cs">

+    <Compile Include="UDPServer.cs">

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientViewBase.cs">

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="PacketServer.cs">

+    <Compile Include="RegionApplicationBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionApplicationBase.cs">

+    <Compile Include="ClientViewBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UDPServer.cs">

+    <Compile Include="ClientView.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 f76a4c8..1c791d3 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
             <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

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

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

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

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

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

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

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

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

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

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

                 <include name="RegionApplicationBase.cs" />

-                <include name="UDPServer.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/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 0a15a49..f9f6b7d 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,13 +98,13 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="CommunicationsLocal.cs">

+    <Compile Include="LocalUserServices.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LocalBackEndServices.cs">

+    <Compile Include="CommunicationsLocal.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LocalUserServices.cs">

+    <Compile Include="LocalBackEndServices.cs">

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index 3cac9d3..bfefabf 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="CommunicationsLocal.cs" />

                 <include name="LocalBackEndServices.cs" />

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

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

             </sources>

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

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 99e9c96..e8ed7f4 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Communications.OGS1
             

             GridParams["authkey"] =  serversInfo.GridSendKey;

             GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();

-            GridParams["sim_ip"] = regionInfo.InternalEndPoint.Address.ToString();

+            GridParams["sim_ip"] = regionInfo.ExternalHostName;

             GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString();

             GridParams["region_locx"] = regionInfo.RegionLocX.ToString();

             GridParams["region_locy"] = regionInfo.RegionLocY.ToString();

@@ -166,6 +166,7 @@ namespace OpenSim.Region.Communications.OGS1
         // Grid Request Processing

         public XmlRpcResponse ExpectUser(XmlRpcRequest request)

         {

+            Console.WriteLine("Expecting User...");

             Hashtable requestData = (Hashtable)request.Params[0];

             AgentCircuitData agentData = new AgentCircuitData();

             agentData.SessionID = new LLUUID((string)requestData["session_id"]);

diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index d6abd13..390326e 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,16 +116,16 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="CommunicationsOGS1.cs">

+    <Compile Include="OGS1UserServices.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OGS1GridServices.cs">

+    <Compile Include="CommunicationsOGS1.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="OGS1InterSimComms.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OGS1UserServices.cs">

+    <Compile Include="OGS1GridServices.cs">

       <SubType>Code</SubType>

     </Compile>

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

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 04d61b9..06f0b9e 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="OGS1UserServices.cs" />

                 <include name="CommunicationsOGS1.cs" />

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

                 <include name="OGS1InterSimComms.cs" />

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

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

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

             </sources>

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

diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 1e726b2..d3f2518 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -154,10 +154,10 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="LlsdMethodEntry.cs">

+    <Compile Include="MyWorld.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MyWorld.cs">

+    <Compile Include="LlsdMethodEntry.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Program.cs">

diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index a826a37..ffcf59e 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="SimpleApp" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="MyWorld.cs" />

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

                 <include name="Program.cs" />

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

             </sources>

diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 147158c..716fd57 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,9 +93,6 @@
     <Compile Include="AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Db4LocalStorage.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="MapStorage.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -105,6 +102,9 @@
     <Compile Include="UUIDPrimQuery.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Db4LocalStorage.cs">

+      <SubType>Code</SubType>

+    </Compile>

   </ItemGroup>

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

   <PropertyGroup>

diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index fc9f055..112ff1c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
             </resources>

             <sources failonempty="true">

                 <include name="AssemblyInfo.cs" />

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

                 <include name="MapStorage.cs" />

                 <include name="UUIDParcelQuery.cs" />

                 <include name="UUIDPrimQuery.cs" />

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

             </sources>

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

                 <lib>