aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2013-12-16 16:36:05 -0500
committerBlueWall2013-12-16 16:36:05 -0500
commitbece6fb8a3331e2fa1b456cb05bd6416c2b31454 (patch)
treea7c394cea0a5a6d97cfeab2174c74c98972c1cfe
parentFix issue with editing notes for other avatars (diff)
parentWrap analysis of the particle system in the UUID Gatherer in a separate try/c... (diff)
downloadopensim-SC_OLD-bece6fb8a3331e2fa1b456cb05bd6416c2b31454.zip
opensim-SC_OLD-bece6fb8a3331e2fa1b456cb05bd6416c2b31454.tar.gz
opensim-SC_OLD-bece6fb8a3331e2fa1b456cb05bd6416c2b31454.tar.bz2
opensim-SC_OLD-bece6fb8a3331e2fa1b456cb05bd6416c2b31454.tar.xz
Merge branch '0.7.6-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.6-post-fixes
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs15
1 files changed, 12 insertions, 3 deletions
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
181 181
182 if (part.ParticleSystem.Length > 0) 182 if (part.ParticleSystem.Length > 0)
183 { 183 {
184 Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0); 184 try
185 if (ps.Texture != UUID.Zero) 185 {
186 assetUuids[ps.Texture] = AssetType.Texture; 186 Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
187 if (ps.Texture != UUID.Zero)
188 assetUuids[ps.Texture] = AssetType.Texture;
189 }
190 catch (Exception e)
191 {
192 m_log.WarnFormat(
193 "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt. Continuing.",
194 part.Name, part.UUID, sceneObject.Name, sceneObject.UUID);
195 }
187 } 196 }
188 197
189 TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 198 TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();