aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-01-16 04:57:49 +0000
committerMelanie2010-01-16 04:57:49 +0000
commit74b3ce857228ae948d99ad4b6ef35f35e7742b2c (patch)
tree62549b6fd08c7d71f1367d8f651d4db5362e186d /OpenSim/Region
parentShorten the names of the tags in monitorstats summary to the immediate type (diff)
downloadopensim-SC_OLD-74b3ce857228ae948d99ad4b6ef35f35e7742b2c.zip
opensim-SC_OLD-74b3ce857228ae948d99ad4b6ef35f35e7742b2c.tar.gz
opensim-SC_OLD-74b3ce857228ae948d99ad4b6ef35f35e7742b2c.tar.bz2
opensim-SC_OLD-74b3ce857228ae948d99ad4b6ef35f35e7742b2c.tar.xz
Let monitor data be requested using either the short form of the name or the
full, namespace qualified version.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index 96d65d7..f15f8f6 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -87,7 +87,10 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
87 87
88 foreach (IMonitor monitor in m_monitors) 88 foreach (IMonitor monitor in m_monitors)
89 { 89 {
90 if (monitor.ToString() == monID) 90 string elemName = monitor.ToString();
91 if (elemName.StartsWith(monitor.GetType().Namespace))
92 elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1);
93 if (elemName == monID || monitor.ToString() == monID)
91 { 94 {
92 Hashtable ereply3 = new Hashtable(); 95 Hashtable ereply3 = new Hashtable();
93 96