From c3452d3f1b376cd32e89808470a2da470cc176cf Mon Sep 17 00:00:00 2001
From: onefang
Date: Wed, 31 Jul 2019 03:55:58 +1000
Subject: OpenSim found a new way for archiving to be spammy.

The few resources that I have checked are actually missing from the
database.  All the ones I tried in world are not missing anything.
---
 .../Archiver/InventoryArchiveWriteRequest.cs       | 24 ++++++++--------------
 .../World/Archiver/ArchiveWriteRequest.cs          | 16 +++++++--------
 2 files changed, 17 insertions(+), 23 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 11c53d7..ec273d6 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -268,16 +268,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();
-- 
cgit v1.1