*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, 48 insertions, 171 deletions

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()

-        {

-        }

-    }

-

-}