diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 604cd2c..b3d3c7c 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -140,9 +140,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
140 | /// <param name="assets"></param> | 140 | /// <param name="assets"></param> |
141 | protected void LoadLibraries(string librariesControlPath) | 141 | protected void LoadLibraries(string librariesControlPath) |
142 | { | 142 | { |
143 | m_log.Info( | 143 | m_log.InfoFormat( |
144 | String.Format( | 144 | "[LIBRARY INVENTORY]: Loading libraries control file {0}", librariesControlPath); |
145 | "[LIBRARY INVENTORY]: Loading libraries control file {0}", librariesControlPath)); | ||
146 | 145 | ||
147 | LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig); | 146 | LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig); |
148 | } | 147 | } |
@@ -188,9 +187,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
188 | 187 | ||
189 | libraryFolders.Add(folderInfo.folderID, folderInfo); | 188 | libraryFolders.Add(folderInfo.folderID, folderInfo); |
190 | parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); | 189 | parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); |
191 | 190 | ||
192 | // m_log.Info( | 191 | // m_log.InfoFormat("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID); |
193 | // String.Format("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID)); | ||
194 | } | 192 | } |
195 | else | 193 | else |
196 | { | 194 | { |
@@ -258,14 +256,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
258 | } | 256 | } |
259 | catch (XmlException e) | 257 | catch (XmlException e) |
260 | { | 258 | { |
261 | m_log.Error( | 259 | m_log.ErrorFormat("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e); |
262 | String.Format("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e)); | ||
263 | } | 260 | } |
264 | } | 261 | } |
265 | else | 262 | else |
266 | { | 263 | { |
267 | m_log.Error( | 264 | m_log.ErrorFormat("[LIBRARY INVENTORY]: {0} file {1} does not exist!", fileDescription, path); |
268 | String.Format("[LIBRARY INVENTORY]: {0} file {1} does not exist!", fileDescription, path)); | ||
269 | } | 265 | } |
270 | } | 266 | } |
271 | 267 | ||