From 3e47df735b86bc17dde156bff38fda38319f7297 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 27 Sep 2016 16:41:13 +0100
Subject: exclude invalid collision sound (used as collision type flag)  from
 assets UUIDGather

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index d8928ee..37b91d3 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -178,8 +178,10 @@ namespace OpenSim.Region.Framework.Scenes
                     if (part.Shape.ProjectionTextureUUID != UUID.Zero)
                         GatheredUuids[part.Shape.ProjectionTextureUUID] = (sbyte)AssetType.Texture;
 
-                    if (part.CollisionSound != UUID.Zero)
-                        GatheredUuids[part.CollisionSound] = (sbyte)AssetType.Sound;
+                    UUID collisionSound = part.CollisionSound;
+                    if ( collisionSound != UUID.Zero &&
+                                collisionSound != part.invalidCollisionSoundUUID)
+                        GatheredUuids[collisionSound] = (sbyte)AssetType.Sound;
 
                     if (part.ParticleSystem.Length > 0)
                     {
-- 
cgit v1.1