5 files changed, 22 insertions, 33 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index ad46107..520ea50 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -231,24 +231,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                 if(curErrorCntr > 0 || possible > 0)
                 {
-                    string spath;
-                    int indx = path.IndexOf("__");
-                    if(indx > 0)
-                         spath = path.Substring(0,indx);
-                    else
-                        spath = path;
-
                     if(curErrorCntr > 0)
                     {
-                        m_log.ErrorFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to  missing or damaged assets",
-                            inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, curErrorCntr);
-                        if(possible > 0)
-                            m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible);
-                    }
-                    else if(possible > 0)
-                    {
-                        m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references that may be to missing or damaged assets or not a problem", inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, possible);
+                        // path is /name__UUID/name__UUID ...
+                        m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to missing or damaged assets,  or not a problem.",
+                            inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), path, curErrorCntr);
+////                        if(possible > 0)
+////                            m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible);
                     }
+////                    else if(possible > 0)
+////                    {
+////                        m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references that may be to missing or damaged assets or not a problem", inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, possible);
+////                    }
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
index 060e753..6b8755b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -275,16 +275,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     possible = assetGatherer.possibleNotAssetCount - possible;
                     if(curErrorCntr > 0)
                     {
-                        m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets",
+                        m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets,  or not a problem.",
                             sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), curErrorCntr);
-                        if(possible > 0)
-                            m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible);
-                    }
-                    else if(possible > 0)
-                    {
-                        m_log.WarnFormat("[ARCHIVER Warning]: object {0} '{1}', at {2}, contains {3} references that may be to missing or damaged assets or not a problem",
-                            sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible);
+////                        if(possible > 0)
+////                            m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible);
                     }
+////                    else if(possible > 0)
+////                    {
+////                        m_log.WarnFormat("[ARCHIVER Warning]: object {0} '{1}', at {2}, contains {3} references that may be to missing or damaged assets or not a problem",
+////                            sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible);
+////                    }
                 }
 
                 assetGatherer.GatherAll();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index 3092fe0..0a955c5 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -143,11 +143,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 asset.Data);
 
             m_assetsWritten++;
-
-            //m_log.DebugFormat("[ARCHIVER]: Added asset {0}", m_assetsWritten);
-
-            if (m_assetsWritten % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0)
-                m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", m_assetsWritten);
         }
 
     }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index f29011e..b5b925f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -664,7 +664,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     {
                         ITerrainLoader terLoader = (ITerrainLoader)Activator.CreateInstance(library.GetType(pluginType.ToString()));
                         m_loaders[terLoader.FileExtension] = terLoader;
-                        m_log.Info("L ... " + typeName);
+                        m_log.Debug("L ... " + typeName);
                     }
                 }
                 catch(AmbiguousMatchException)
@@ -680,12 +680,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 if (!m_plugineffects.ContainsKey(pluginName))
                 {
                     m_plugineffects.Add(pluginName, effect);
-                    m_log.Info("E ... " + pluginName);
+                    m_log.Debug("E ... " + pluginName);
                 }
                 else
                 {
                     m_plugineffects[pluginName] = effect;
-                    m_log.Info("E ... " + pluginName + " (Replaced)");
+                    m_log.Debug("E ... " + pluginName + " (Replaced)");
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index 51faa0e..183b985 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules
             // Register all the Wind Model Plug-ins
             foreach (IWindModelPlugin windPlugin in AddinManager.GetExtensionObjects("/OpenSim/WindModule", false))
             {
-                m_log.InfoFormat("[WIND] Found Plugin: {0}", windPlugin.Name);
+                m_log.DebugFormat("[WIND] Found Plugin: {0}", windPlugin.Name);
                 m_availableWindPlugins.Add(windPlugin.Name, windPlugin);
             }
 
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules
             {
                 m_activeWindPlugin = m_availableWindPlugins[m_dWindPluginName];
 
-                m_log.InfoFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName);
+                m_log.DebugFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName);
 
                 if (m_windConfig != null)
                 {