aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2019-07-31 03:55:58 +1000
committeronefang2019-07-31 03:55:58 +1000
commitc3452d3f1b376cd32e89808470a2da470cc176cf (patch)
tree671f4ce3b24c74aff63b97c9c3ea8c21ccefc108
parentOpensim user needs a proper shell. (diff)
downloadopensim-SC_OLD-c3452d3f1b376cd32e89808470a2da470cc176cf.zip
opensim-SC_OLD-c3452d3f1b376cd32e89808470a2da470cc176cf.tar.gz
opensim-SC_OLD-c3452d3f1b376cd32e89808470a2da470cc176cf.tar.bz2
opensim-SC_OLD-c3452d3f1b376cd32e89808470a2da470cc176cf.tar.xz
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.
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs24
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs16
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
231 231
232 if(curErrorCntr > 0 || possible > 0) 232 if(curErrorCntr > 0 || possible > 0)
233 { 233 {
234 string spath;
235 int indx = path.IndexOf("__");
236 if(indx > 0)
237 spath = path.Substring(0,indx);
238 else
239 spath = path;
240
241 if(curErrorCntr > 0) 234 if(curErrorCntr > 0)
242 { 235 {
243 m_log.ErrorFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to missing or damaged assets", 236 // path is /name__UUID/name__UUID ...
244 inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, curErrorCntr); 237 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.",
245 if(possible > 0) 238 inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), path, curErrorCntr);
246 m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible); 239//// if(possible > 0)
247 } 240//// m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible);
248 else if(possible > 0)
249 {
250 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);
251 } 241 }
242//// else if(possible > 0)
243//// {
244//// 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);
245//// }
252 } 246 }
253 } 247 }
254 } 248 }
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
268 possible = assetGatherer.possibleNotAssetCount - possible; 268 possible = assetGatherer.possibleNotAssetCount - possible;
269 if(curErrorCntr > 0) 269 if(curErrorCntr > 0)
270 { 270 {
271 m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets", 271 m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets, or not a problem.",
272 sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), curErrorCntr); 272 sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), curErrorCntr);
273 if(possible > 0) 273//// if(possible > 0)
274 m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible); 274//// m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible);
275 }
276 else if(possible > 0)
277 {
278 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",
279 sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible);
280 } 275 }
276//// else if(possible > 0)
277//// {
278//// 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",
279//// sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible);
280//// }
281 } 281 }
282 282
283 assetGatherer.GatherAll(); 283 assetGatherer.GatherAll();