diff options
author | UbitUmarov | 2017-06-23 17:48:59 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-23 17:48:59 +0100 |
commit | 83e443bca168629045a054bf06e5c5e2302a27dc (patch) | |
tree | 9ce9382ec16b72f4cf72b313bbdf74a67ab59be6 /OpenSim | |
parent | coment out missing or damage assets messages in uuidgather that are not very... (diff) | |
download | opensim-SC_OLD-83e443bca168629045a054bf06e5c5e2302a27dc.zip opensim-SC_OLD-83e443bca168629045a054bf06e5c5e2302a27dc.tar.gz opensim-SC_OLD-83e443bca168629045a054bf06e5c5e2302a27dc.tar.bz2 opensim-SC_OLD-83e443bca168629045a054bf06e5c5e2302a27dc.tar.xz |
do the same on OAR saves
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs index 9500eb6..d02db73 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | |||
@@ -257,7 +257,22 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
257 | int prevAssets = assetUuids.Count; | 257 | int prevAssets = assetUuids.Count; |
258 | 258 | ||
259 | foreach (SceneObjectGroup sceneObject in sceneObjects) | 259 | foreach (SceneObjectGroup sceneObject in sceneObjects) |
260 | { | ||
261 | int curErrorCntr = assetGatherer.ErrorCount; | ||
260 | assetGatherer.AddForInspection(sceneObject); | 262 | assetGatherer.AddForInspection(sceneObject); |
263 | assetGatherer.GatherAll(); | ||
264 | curErrorCntr = assetGatherer.ErrorCount - curErrorCntr; | ||
265 | if(curErrorCntr > 1) | ||
266 | { | ||
267 | m_log.WarnFormat("[INVENTORY ARCHIVER]: object {0} '{1}', at {2}, contains at least {3} references to missing or damaged assets", | ||
268 | sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), curErrorCntr); | ||
269 | } | ||
270 | else if(curErrorCntr == 1) | ||
271 | { | ||
272 | m_log.WarnFormat("[INVENTORY ARCHIVER]: object {0} '{1}', at {2}, contains at least 1 reference to a missing or damaged asset", | ||
273 | sceneObject.UUID, sceneObject.Name, sceneObject.AbsolutePosition.ToString()); | ||
274 | } | ||
275 | } | ||
261 | 276 | ||
262 | assetGatherer.GatherAll(); | 277 | assetGatherer.GatherAll(); |
263 | 278 | ||
@@ -266,7 +281,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
266 | "[ARCHIVER]: {0} region scene objects to save reference {1} assets", | 281 | "[ARCHIVER]: {0} region scene objects to save reference {1} assets", |
267 | sceneObjects.Count, assetUuids.Count - prevAssets + errors); | 282 | sceneObjects.Count, assetUuids.Count - prevAssets + errors); |
268 | if(errors > 0) | 283 | if(errors > 0) |
269 | m_log.DebugFormat("[ARCHIVER]: {0} of this assets have problems and will be ignored", errors); | 284 | m_log.DebugFormat("[ARCHIVER]: {0} of these assets have problems and will be ignored", errors); |
270 | } | 285 | } |
271 | 286 | ||
272 | if (numObjectsSkippedPermissions > 0) | 287 | if (numObjectsSkippedPermissions > 0) |