1 files changed, 34 insertions, 1 deletions

diff --git a/OpenSim.Framework/SimProfile.cs b/OpenSim.Framework/SimProfile.cs
index ac4cf9e..fd130f0 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim.Framework/SimProfile.cs
@@ -16,11 +16,43 @@ namespace OpenSim.Framework.Sims
             {

                 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 = (ulong)Convert.ToUInt64(RespData["regionhandle"]);

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

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

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

+                this.caps_url = (string)RespData["caps_url"];

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

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

+                this.sendkey = (string)RespData["sendkey"];

+                this.recvkey = (string)RespData["recvkey"];

+            }

+            catch (Exception e)

+            {

+                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["caller"] = "userserver";

                 GridReqParams["authkey"] = SendKey;

                 ArrayList SendParams = new ArrayList();

                 SendParams.Add(GridReqParams);

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

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

 

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

 

@@ -42,6 +74,7 @@ namespace OpenSim.Framework.Sims
             }

             return this;

         }

+
 

         public SimProfile()

         {