aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
diff options
context:
space:
mode:
authorBlueWall2012-01-17 21:09:46 -0500
committerBlueWall2012-01-17 21:09:46 -0500
commitef5575be1b7e8122883773c799ddc522ed80c156 (patch)
treec3f8ab837b456989106e286ca109bc2efeca1946 /OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
parentprotect the region ready alerts for loading oarfiles if no post URI is set (diff)
downloadopensim-SC_OLD-ef5575be1b7e8122883773c799ddc522ed80c156.zip
opensim-SC_OLD-ef5575be1b7e8122883773c799ddc522ed80c156.tar.gz
opensim-SC_OLD-ef5575be1b7e8122883773c799ddc522ed80c156.tar.bz2
opensim-SC_OLD-ef5575be1b7e8122883773c799ddc522ed80c156.tar.xz
Add json handler for GridInfo
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
index 8472d34..f9b5915 100644
--- a/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
@@ -48,6 +48,8 @@ namespace OpenSim.Server.Handlers.Grid
48 48
49 server.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", 49 server.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info",
50 handlers.RestGetGridInfoMethod)); 50 handlers.RestGetGridInfoMethod));
51 server.AddStreamHandler(new RestStreamHandler("GET", "/json_grid_info",
52 handlers.JsonGetGridInfoMethod));
51 server.AddXmlRPCHandler("get_grid_info", handlers.XmlRpcGridInfoMethod); 53 server.AddXmlRPCHandler("get_grid_info", handlers.XmlRpcGridInfoMethod);
52 } 54 }
53 55