aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-03 01:45:49 +0100
committerJustin Clark-Casey (justincc)2012-05-03 01:45:49 +0100
commit231a3bf147315a9284140476d2b09e13c3fee1c0 (patch)
treef04ffb5bb43d919c1687af57e4cb48829f6dc437 /OpenSim/Region/Application/OpenSimBase.cs
parentComment out the five second sleep in etm.DoTeleport() if the old agent needs ... (diff)
downloadopensim-SC-231a3bf147315a9284140476d2b09e13c3fee1c0.zip
opensim-SC-231a3bf147315a9284140476d2b09e13c3fee1c0.tar.gz
opensim-SC-231a3bf147315a9284140476d2b09e13c3fee1c0.tar.bz2
opensim-SC-231a3bf147315a9284140476d2b09e13c3fee1c0.tar.xz
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
This is most useful for capabilities where the url is not self-describing.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 5de3f25..79259d8 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -388,7 +388,7 @@ namespace OpenSim
388 scene.LoadPrimsFromStorage(regionInfo.originRegionID); 388 scene.LoadPrimsFromStorage(regionInfo.originRegionID);
389 389
390 // TODO : Try setting resource for region xstats here on scene 390 // TODO : Try setting resource for region xstats here on scene
391 MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 391 MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo));
392 392
393 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); 393 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
394 scene.EventManager.TriggerParcelPrimCountUpdate(); 394 scene.EventManager.TriggerParcelPrimCountUpdate();
@@ -773,6 +773,9 @@ namespace OpenSim
773 return Util.UTF8.GetBytes("OK"); 773 return Util.UTF8.GetBytes("OK");
774 } 774 }
775 775
776 public string Name { get { return "SimStatus"; } }
777 public string Description { get { return "Simulator Status"; } }
778
776 public string ContentType 779 public string ContentType
777 { 780 {
778 get { return "text/plain"; } 781 get { return "text/plain"; }
@@ -797,6 +800,9 @@ namespace OpenSim
797 { 800 {
798 OpenSimBase m_opensim; 801 OpenSimBase m_opensim;
799 string osXStatsURI = String.Empty; 802 string osXStatsURI = String.Empty;
803
804 public string Name { get { return "XSimStatus"; } }
805 public string Description { get { return "Simulator XStatus"; } }
800 806
801 public XSimStatusHandler(OpenSimBase sim) 807 public XSimStatusHandler(OpenSimBase sim)
802 { 808 {
@@ -837,6 +843,9 @@ namespace OpenSim
837 { 843 {
838 OpenSimBase m_opensim; 844 OpenSimBase m_opensim;
839 string osUXStatsURI = String.Empty; 845 string osUXStatsURI = String.Empty;
846
847 public string Name { get { return "UXSimStatus"; } }
848 public string Description { get { return "Simulator UXStatus"; } }
840 849
841 public UXSimStatusHandler(OpenSimBase sim) 850 public UXSimStatusHandler(OpenSimBase sim)
842 { 851 {