diff options
| author | BlueWall | 2012-01-17 21:10:31 -0500 |
|---|---|---|
| committer | BlueWall | 2012-01-17 21:10:31 -0500 |
| commit | 939d60da591b73267bd371c59dc67b78c09ff0be (patch) | |
| tree | f0b2c424703dd319fae9793b6dd25749d76b195e /OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs | |
| parent | Allow retrival of multiple user records in one operation, analog to presence (diff) | |
| parent | Add json handler for GridInfo (diff) | |
| download | opensim-SC_OLD-939d60da591b73267bd371c59dc67b78c09ff0be.zip opensim-SC_OLD-939d60da591b73267bd371c59dc67b78c09ff0be.tar.gz opensim-SC_OLD-939d60da591b73267bd371c59dc67b78c09ff0be.tar.bz2 opensim-SC_OLD-939d60da591b73267bd371c59dc67b78c09ff0be.tar.xz | |
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
Diffstat (limited to 'OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs | 2 |
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 | ||