diff options
author | UbitUmarov | 2017-06-21 21:38:12 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-21 21:38:12 +0100 |
commit | 11d38607811d1f2dca58bc3d99b4ad698d6b228a (patch) | |
tree | 289e43f0b773d22c245abe4ff053f4d3c272298f /OpenSim/Region/Framework/Scenes | |
parent | do not try to store on oars temporary or in transit objects ( they may be del... (diff) | |
download | opensim-SC_OLD-11d38607811d1f2dca58bc3d99b4ad698d6b228a.zip opensim-SC_OLD-11d38607811d1f2dca58bc3d99b4ad698d6b228a.tar.gz opensim-SC_OLD-11d38607811d1f2dca58bc3d99b4ad698d6b228a.tar.bz2 opensim-SC_OLD-11d38607811d1f2dca58bc3d99b4ad698d6b228a.tar.xz |
avoid some broken object assets present in osgrid inventories due to past problems, etc
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index 5a9a5a0..bac069b 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -142,6 +142,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
142 | { | 142 | { |
143 | // m_log.DebugFormat( | 143 | // m_log.DebugFormat( |
144 | // "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID); | 144 | // "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID); |
145 | if(sceneObject.IsDeleted) | ||
146 | return; | ||
145 | 147 | ||
146 | SceneObjectPart[] parts = sceneObject.Parts; | 148 | SceneObjectPart[] parts = sceneObject.Parts; |
147 | for (int i = 0; i < parts.Length; i++) | 149 | for (int i = 0; i < parts.Length; i++) |
@@ -489,6 +491,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
489 | /// <param name="sceneObjectAsset"></param> | 491 | /// <param name="sceneObjectAsset"></param> |
490 | private void RecordSceneObjectAssetUuids(AssetBase sceneObjectAsset) | 492 | private void RecordSceneObjectAssetUuids(AssetBase sceneObjectAsset) |
491 | { | 493 | { |
494 | if(sceneObjectAsset.Data == null || sceneObjectAsset.Data.Length == 0) | ||
495 | { | ||
496 | m_log.WarnFormat("[UUIDgatherer] Error: object asset '{0}' id: {1} has no data", | ||
497 | sceneObjectAsset.Name,sceneObjectAsset.ID.ToString()); | ||
498 | return; | ||
499 | } | ||
500 | |||
492 | string xml = Utils.BytesToString(sceneObjectAsset.Data); | 501 | string xml = Utils.BytesToString(sceneObjectAsset.Data); |
493 | 502 | ||
494 | CoalescedSceneObjects coa; | 503 | CoalescedSceneObjects coa; |