aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:24:34 +0100
committerMelanie2011-10-12 07:24:34 +0100
commit628ca122b8e5911b5d7cbd5b8d55081eca67f536 (patch)
treebf1f05f74d6c30dbc3d9639cbe1d770eacbd6e82 /OpenSim/Region/CoreModules
parentMerge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge (diff)
parentAllow monitoring of stats by region name (diff)
downloadopensim-SC-628ca122b8e5911b5d7cbd5b8d55081eca67f536.zip
opensim-SC-628ca122b8e5911b5d7cbd5b8d55081eca67f536.tar.gz
opensim-SC-628ca122b8e5911b5d7cbd5b8d55081eca67f536.tar.bz2
opensim-SC-628ca122b8e5911b5d7cbd5b8d55081eca67f536.tar.xz
Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index a9dc1fe..64997af 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections; 29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Reflection; 31using System.Reflection;
@@ -76,6 +77,8 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
76 DebugMonitors); 77 DebugMonitors);
77 78
78 MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID, StatsPage); 79 MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID, StatsPage);
80 MainServer.Instance.AddHTTPHandler(
81 "/monitorstats/" + Uri.EscapeDataString(m_scene.RegionInfo.RegionName), StatsPage);
79 } 82 }
80 83
81 public void DebugMonitors(string module, string[] args) 84 public void DebugMonitors(string module, string[] args)