*Removed SimProfile.cs as it is no longer needed (in favor of SimProfileData)

*Added simulator_data_request XMLRPC method to request data from the grid server about a sim instead of faking its login
*Login is progressing, now just getting an XML error (http://pastebin.com/942515) -- if you can fix this, throw MingChen in IRC a Private Message

3 files changed, 99 insertions, 21 deletions

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; 

+        }

     }

 }