aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/CreateCommsManager
diff options
context:
space:
mode:
authorCharles Krinke2009-04-17 21:48:48 +0000
committerCharles Krinke2009-04-17 21:48:48 +0000
commitb4cb45bb79619306b25c67c770165ab752aeb742 (patch)
tree3d1a7d763a3cc3647aff6a07462971c9f12b2d5c /OpenSim/ApplicationPlugins/CreateCommsManager
parent* Add Implementation of Linear Motor and Linear friction from the LSL Vehicle... (diff)
downloadopensim-SC-b4cb45bb79619306b25c67c770165ab752aeb742.zip
opensim-SC-b4cb45bb79619306b25c67c770165ab752aeb742.tar.gz
opensim-SC-b4cb45bb79619306b25c67c770165ab752aeb742.tar.bz2
opensim-SC-b4cb45bb79619306b25c67c770165ab752aeb742.tar.xz
Fixes Mantis # 3469. Thank you kindly, BlueWall, for a patch that:
This patch adds extended status reporting with the url http://server:port/simstatusx/ [^] . The data is returned in json format as "text/plain" type.
Diffstat (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 3985f42..a0c592e 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -205,6 +205,8 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
205 = new CommunicationsOGS1(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, libraryRootFolder); 205 = new CommunicationsOGS1(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, libraryRootFolder);
206 206
207 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 207 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
208 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
209
208 } 210 }
209 211
210 protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) 212 protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
@@ -240,6 +242,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
240 HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices; 242 HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices;
241 243
242 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 244 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
245 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
243 } 246 }
244 247
245 private void CreateGridInfoService() 248 private void CreateGridInfoService()
@@ -250,4 +253,4 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
250 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); 253 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
251 } 254 }
252 } 255 }
253} \ No newline at end of file 256}