aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-02-13 02:43:41 +0000
committerJustin Clarke Casey2008-02-13 02:43:41 +0000
commita1a206cb056e68ea30105f8aef91efb017d8426e (patch)
tree85cd1115199ac3204804ed17e200cebf53961daa
parentCommenting and a spelling correction (diff)
downloadopensim-SC_OLD-a1a206cb056e68ea30105f8aef91efb017d8426e.zip
opensim-SC_OLD-a1a206cb056e68ea30105f8aef91efb017d8426e.tar.gz
opensim-SC_OLD-a1a206cb056e68ea30105f8aef91efb017d8426e.tar.bz2
opensim-SC_OLD-a1a206cb056e68ea30105f8aef91efb017d8426e.tar.xz
* Clean up LIBRARY INVENTORY messages
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs25
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs8
2 files changed, 16 insertions, 17 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 46767bb..604cd2c 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.Communications.Cache
55 55
56 public LibraryRootFolder() 56 public LibraryRootFolder()
57 { 57 {
58 m_log.Info("[LIBRARYINVENTORY]: Loading library inventory"); 58 m_log.Info("[LIBRARY INVENTORY]: Loading library inventory");
59 59
60 agentID = libOwner; 60 agentID = libOwner;
61 folderID = new LLUUID("00000112-000f-0000-0000-000100bba000"); 61 folderID = new LLUUID("00000112-000f-0000-0000-000100bba000");
@@ -141,7 +141,8 @@ namespace OpenSim.Framework.Communications.Cache
141 protected void LoadLibraries(string librariesControlPath) 141 protected void LoadLibraries(string librariesControlPath)
142 { 142 {
143 m_log.Info( 143 m_log.Info(
144 String.Format("LIBRARYINVENTORY", "Loading libraries control file {0}", librariesControlPath)); 144 String.Format(
145 "[LIBRARY INVENTORY]: Loading libraries control file {0}", librariesControlPath));
145 146
146 LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig); 147 LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig);
147 } 148 }
@@ -189,14 +190,13 @@ namespace OpenSim.Framework.Communications.Cache
189 parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); 190 parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
190 191
191// m_log.Info( 192// m_log.Info(
192// String.Format("[LIBRARYINVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID)); 193// String.Format("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID));
193 } 194 }
194 else 195 else
195 { 196 {
196 m_log.Warn( 197 m_log.WarnFormat(
197 String.Format("[LIBRARYINVENTORY]: " + 198 "[LIBRARY INVENTORY]: Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!",
198 "Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!", 199 folderInfo.name, folderInfo.folderID, folderInfo.parentID);
199 folderInfo.name, folderInfo.folderID, folderInfo.parentID));
200 } 200 }
201 } 201 }
202 202
@@ -229,10 +229,9 @@ namespace OpenSim.Framework.Communications.Cache
229 } 229 }
230 else 230 else
231 { 231 {
232 m_log.Warn( 232 m_log.WarnFormat(
233 String.Format("[LIBRARYINVENTORY]: " + 233 "[LIBRARY INVENTORY]: Couldn't add item {0} ({1}) since parent folder with ID {2} does not exist!",
234 "Couldn't add item {0} ({1}) since parent folder with ID {2} does not exist!", 234 item.inventoryName, item.inventoryID, item.parentFolderID);
235 item.inventoryName, item.inventoryID, item.parentFolderID));
236 } 235 }
237 } 236 }
238 237
@@ -260,13 +259,13 @@ namespace OpenSim.Framework.Communications.Cache
260 catch (XmlException e) 259 catch (XmlException e)
261 { 260 {
262 m_log.Error( 261 m_log.Error(
263 String.Format("[LIBRARYINVENTORY]: Error loading {0} : {1}", path, e)); 262 String.Format("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e));
264 } 263 }
265 } 264 }
266 else 265 else
267 { 266 {
268 m_log.Error( 267 m_log.Error(
269 String.Format("[LIBRARYINVENTORY]: {0} file {1} does not exist!", fileDescription, path)); 268 String.Format("[LIBRARY INVENTORY]: {0} file {1} does not exist!", fileDescription, path));
270 } 269 }
271 } 270 }
272 271
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 58405e6..4d00c5b 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -51,10 +51,10 @@ namespace OpenSim.Region.ClientStack
51 /// </summary> 51 /// </summary>
52 public class ClientView : IClientAPI 52 public class ClientView : IClientAPI
53 { 53 {
54 // ~ClientView() 54// ~ClientView()
55 // { 55// {
56 // System.Console.WriteLine("[CLIENTVIEW]: Destructor called"); 56// System.Console.WriteLine("[CLIENTVIEW]: Destructor called");
57 // } 57// }
58 58
59 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 59 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
60 60