From 583f2a9de8e503773a427facd5f81a82b40bd585 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 5 Jul 2007 15:15:28 +0000
Subject: *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

---
 OpenSim/Grid/GridServer/GridManager.cs | 35 ++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'OpenSim/Grid/GridServer/GridManager.cs')

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;
-- 
cgit v1.1