diff options
author | Melanie | 2010-02-08 15:53:20 +0000 |
---|---|---|
committer | Melanie | 2010-02-08 15:53:38 +0000 |
commit | baaf660511214e52ea4ed20b8e80ec8e1ff06a3a (patch) | |
tree | 1e90c7a22ea3354d6bfd5d2b3f8f64f199dbd477 /OpenSim/Region/CoreModules/Framework | |
parent | Added missing configs to Standalone.ini (diff) | |
parent | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched (diff) | |
download | opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.zip opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.gz opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.bz2 opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.xz |
Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index e53290c..e37da9f 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -191,7 +191,6 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
191 | { | 191 | { |
192 | m_log.DebugFormat("[LIBRARY MODULE]: Exception when processing archive {0}: {1}", iarFileName, e.Message); | 192 | m_log.DebugFormat("[LIBRARY MODULE]: Exception when processing archive {0}: {1}", iarFileName, e.Message); |
193 | } | 193 | } |
194 | |||
195 | } | 194 | } |
196 | 195 | ||
197 | } | 196 | } |
@@ -203,6 +202,14 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
203 | m_log.DebugFormat(" - folder {0}", lib.Name); | 202 | m_log.DebugFormat(" - folder {0}", lib.Name); |
204 | DumpFolder(lib); | 203 | DumpFolder(lib); |
205 | } | 204 | } |
205 | // | ||
206 | // private void DumpLibrary() | ||
207 | // { | ||
208 | // InventoryFolderImpl lib = m_Scene.CommsManager.UserProfileCacheService.LibraryRoot; | ||
209 | // | ||
210 | // m_log.DebugFormat(" - folder {0}", lib.Name); | ||
211 | // DumpFolder(lib); | ||
212 | // } | ||
206 | 213 | ||
207 | private void DumpFolder(InventoryFolderImpl folder) | 214 | private void DumpFolder(InventoryFolderImpl folder) |
208 | { | 215 | { |
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 | ||