From c1ff245bf34d5dab3e83b9fd9aaa214ca3ee65e2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 01:48:03 +0000
Subject: Wrap analysis of the particle system in the UUID Gatherer in a
 separate try/catch as sometimes it appears that this can be corrupt.

As per Oren's suggestion.
---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 502c748..3e074b9 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -181,9 +181,18 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (part.ParticleSystem.Length > 0)
                     {
-                        Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
-                        if (ps.Texture != UUID.Zero)
-                            assetUuids[ps.Texture] = AssetType.Texture;
+                        try
+                        {
+                            Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
+                            if (ps.Texture != UUID.Zero)
+                                assetUuids[ps.Texture] = AssetType.Texture;
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.WarnFormat(
+                                "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt.  Continuing.", 
+                                part.Name, part.UUID, sceneObject.Name, sceneObject.UUID);
+                        }
                     }
 
                     TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
-- 
cgit v1.1