aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs35
-rw-r--r--OpenSim/Grid/GridServer/Main.cs1
-rw-r--r--OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj4
-rw-r--r--OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build2
4 files changed, 39 insertions, 3 deletions
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
268 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); 268 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
269 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; 269 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
270 270
271 Console.WriteLine("NEW SIM: " + TheSim.serverURI);
271 TheSim.regionName = (string)requestData["sim_name"]; 272 TheSim.regionName = (string)requestData["sim_name"];
272 TheSim.UUID = new LLUUID((string)requestData["UUID"]); 273 TheSim.UUID = new LLUUID((string)requestData["UUID"]);
273 274
@@ -376,6 +377,40 @@ namespace OpenSim.Grid.GridServer
376 return response; 377 return response;
377 } 378 }
378 379
380 public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request)
381 {
382 Hashtable requestData = (Hashtable)request.Params[0];
383 Hashtable responseData = new Hashtable();
384 SimProfileData simData = null;
385 if (requestData.ContainsKey("region_UUID"))
386 {
387 simData = getRegion(new LLUUID((string)requestData["region_UUID"]));
388 }
389 else if (requestData.ContainsKey("region_handle"))
390 {
391 simData = getRegion(Convert.ToUInt64((string)requestData["region_handle"]));
392 }
393
394 if (simData == null)
395 {
396 //Sim does not exist
397 responseData["error"] = "Sim does not exist";
398 }
399 else
400 {
401 responseData["sim_ip"] = simData.serverIP;
402 responseData["sim_port"] = simData.serverPort.ToString();
403 responseData["region_locx"] = simData.regionLocX;
404 responseData["region_locy"] = simData.regionLocY;
405 responseData["region_UUID"] = simData.UUID.UUID.ToString();
406 responseData["region_name"] = simData.regionName;
407 }
408
409 XmlRpcResponse response = new XmlRpcResponse();
410 response.Value = responseData;
411 return response;
412 }
413
379 public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request) 414 public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request)
380 { 415 {
381 int xmin=980, ymin=980, xmax=1020, ymax=1020; 416 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
125 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 125 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
126 126
127 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); 127 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
128 httpServer.AddXmlRPCHandler("simulator_data_request", m_gridManager.XmlRpcSimulatorDataRequestMethod);
128 httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod); 129 httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);
129 130
130 httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod )); 131 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 @@
114 </ProjectReference> 114 </ProjectReference>
115 </ItemGroup> 115 </ItemGroup>
116 <ItemGroup> 116 <ItemGroup>
117 <Compile Include="GridManager.cs"> 117 <Compile Include="Main.cs">
118 <SubType>Code</SubType> 118 <SubType>Code</SubType>
119 </Compile> 119 </Compile>
120 <Compile Include="Main.cs"> 120 <Compile Include="GridManager.cs">
121 <SubType>Code</SubType> 121 <SubType>Code</SubType>
122 </Compile> 122 </Compile>
123 <Compile Include="Properties\AssemblyInfo.cs"> 123 <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 @@
11 <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="GridManager.cs" />
15 <include name="Main.cs" /> 14 <include name="Main.cs" />
15 <include name="GridManager.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 16 <include name="Properties/AssemblyInfo.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">