aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
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/Framework/Servers
parent* Add Implementation of Linear Motor and Linear friction from the LSL Vehicle... (diff)
downloadopensim-SC_OLD-b4cb45bb79619306b25c67c770165ab752aeb742.zip
opensim-SC_OLD-b4cb45bb79619306b25c67c770165ab752aeb742.tar.gz
opensim-SC_OLD-b4cb45bb79619306b25c67c770165ab752aeb742.tar.bz2
opensim-SC_OLD-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/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 9794a10..f22a6e8 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -40,6 +40,10 @@ using OpenSim.Framework.Console;
40using OpenSim.Framework.Statistics; 40using OpenSim.Framework.Statistics;
41using Timer=System.Timers.Timer; 41using Timer=System.Timers.Timer;
42 42
43using OpenMetaverse;
44using OpenMetaverse.StructuredData;
45
46
43namespace OpenSim.Framework.Servers 47namespace OpenSim.Framework.Servers
44{ 48{
45 /// <summary> 49 /// <summary>
@@ -454,6 +458,10 @@ namespace OpenSim.Framework.Servers
454 } 458 }
455 } 459 }
456 460
461
462 public string StatReport() {
463 return m_stats.XReport();
464 }
457 465
458 protected void RemovePIDFile() 466 protected void RemovePIDFile()
459 { 467 {