OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2010-01-18 17:24:21 +00:00
parent d9c48e70a9 3ff28e7a8f
commit e3dbd79543
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
View File

@ -87,7 +87,10 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
foreach (IMonitor monitor in m_monitors) foreach (IMonitor monitor in m_monitors)
{ {
if (monitor.ToString() == monID) string elemName = monitor.ToString();
if (elemName.StartsWith(monitor.GetType().Namespace))
elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1);
if (elemName == monID || monitor.ToString() == monID)
{ {
Hashtable ereply3 = new Hashtable(); Hashtable ereply3 = new Hashtable();
@ -112,7 +115,11 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
string xml = "<data>"; string xml = "<data>";
foreach (IMonitor monitor in m_monitors) foreach (IMonitor monitor in m_monitors)
{ {
xml += "<" + monitor.ToString() + ">" + monitor.GetValue() + "</" + monitor.ToString() + ">"; string elemName = monitor.ToString();
if (elemName.StartsWith(monitor.GetType().Namespace))
elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1);
xml += "<" + elemName + ">" + monitor.GetValue() + "</" + elemName + ">";
} }
xml += "</data>"; xml += "</data>";