Fixes a null reference trying to work with a zero asset ID.

Also removes a misleading error message.
HalcyonGrid · Mar 25, 2019 · 7acca5a · 7acca5a
1 parent 99bc916
commit 7acca5a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -175,14 +175,13 @@ public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, int
                     {
                         //m_log.DebugFormat("[ARCHIVER]: Analysing item asset type {0}", tii.Type);
 
-                        if (!assetUuids.ContainsKey(tii.AssetID))
+                        if ((tii.AssetID != UUID.Zero) && (!assetUuids.ContainsKey(tii.AssetID)))
                             GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
                     }
                 }
                 catch (Exception e)
                 {
                     m_log.ErrorFormat("[ASSET GATHERER]: Failed to get part - {0}", e);
-                    m_log.DebugFormat("[ASSET GATHERER]: Texture entry length for prim was {0} (min is 46)", part.Shape.TextureEntryBytes.Length);
                 }
             }
         }