aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/Main.cs
diff options
context:
space:
mode:
authormingchen2007-07-05 15:15:28 +0000
committermingchen2007-07-05 15:15:28 +0000
commit583f2a9de8e503773a427facd5f81a82b40bd585 (patch)
tree35d434db32056e7d0b231f56f2732c031c130a1d /OpenSim/Grid/GridServer/Main.cs
parent* Tweaks to Java engine (uses less threads). Added support for OnFrame and On... (diff)
downloadopensim-SC-583f2a9de8e503773a427facd5f81a82b40bd585.zip
opensim-SC-583f2a9de8e503773a427facd5f81a82b40bd585.tar.gz
opensim-SC-583f2a9de8e503773a427facd5f81a82b40bd585.tar.bz2
opensim-SC-583f2a9de8e503773a427facd5f81a82b40bd585.tar.xz
*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
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer/Main.cs1
1 files changed, 1 insertions, 0 deletions
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 ));