diff options
| author | Melanie | 2010-01-16 04:40:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-16 04:40:33 +0000 |
| commit | dc6d37d2fe96b0e89f3e07683497cf2049bae9d6 (patch) | |
| tree | 4bcebb5da3c28c87d1250ff02d5e0b89ba178014 | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| parent | Shorten the names of the tags in monitorstats summary to the immediate type (diff) | |
| download | opensim-SC-dc6d37d2fe96b0e89f3e07683497cf2049bae9d6.zip opensim-SC-dc6d37d2fe96b0e89f3e07683497cf2049bae9d6.tar.gz opensim-SC-dc6d37d2fe96b0e89f3e07683497cf2049bae9d6.tar.bz2 opensim-SC-dc6d37d2fe96b0e89f3e07683497cf2049bae9d6.tar.xz | |
Merge branch 'master' into presence-refactor
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs index d84f4ea..96d65d7 100644 --- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | |||
| @@ -112,7 +112,11 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
| 112 | string xml = "<data>"; | 112 | string xml = "<data>"; |
| 113 | foreach (IMonitor monitor in m_monitors) | 113 | foreach (IMonitor monitor in m_monitors) |
| 114 | { | 114 | { |
| 115 | xml += "<" + monitor.ToString() + ">" + monitor.GetValue() + "</" + monitor.ToString() + ">"; | 115 | string elemName = monitor.ToString(); |
| 116 | if (elemName.StartsWith(monitor.GetType().Namespace)) | ||
| 117 | elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1); | ||
| 118 | |||
| 119 | xml += "<" + elemName + ">" + monitor.GetValue() + "</" + elemName + ">"; | ||
| 116 | } | 120 | } |
| 117 | xml += "</data>"; | 121 | xml += "</data>"; |
| 118 | 122 | ||