diff options
| author | UbitUmarov | 2016-09-27 16:41:13 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-09-27 16:41:13 +0100 |
| commit | 3e47df735b86bc17dde156bff38fda38319f7297 (patch) | |
| tree | db4396b9abc93dfac5e014d099c9345de62f2d67 /OpenSim/Region/Framework | |
| parent | load oar; activate area cliping if bounding-origin option is given. as help says (diff) | |
| download | opensim-SC_OLD-3e47df735b86bc17dde156bff38fda38319f7297.zip opensim-SC_OLD-3e47df735b86bc17dde156bff38fda38319f7297.tar.gz opensim-SC_OLD-3e47df735b86bc17dde156bff38fda38319f7297.tar.bz2 opensim-SC_OLD-3e47df735b86bc17dde156bff38fda38319f7297.tar.xz | |
exclude invalid collision sound (used as collision type flag) from assets UUIDGather
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 6 |
1 files changed, 4 insertions, 2 deletions
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 | |||
| 178 | if (part.Shape.ProjectionTextureUUID != UUID.Zero) | 178 | if (part.Shape.ProjectionTextureUUID != UUID.Zero) |
| 179 | GatheredUuids[part.Shape.ProjectionTextureUUID] = (sbyte)AssetType.Texture; | 179 | GatheredUuids[part.Shape.ProjectionTextureUUID] = (sbyte)AssetType.Texture; |
| 180 | 180 | ||
| 181 | if (part.CollisionSound != UUID.Zero) | 181 | UUID collisionSound = part.CollisionSound; |
| 182 | GatheredUuids[part.CollisionSound] = (sbyte)AssetType.Sound; | 182 | if ( collisionSound != UUID.Zero && |
| 183 | collisionSound != part.invalidCollisionSoundUUID) | ||
| 184 | GatheredUuids[collisionSound] = (sbyte)AssetType.Sound; | ||
| 183 | 185 | ||
| 184 | if (part.ParticleSystem.Length > 0) | 186 | if (part.ParticleSystem.Length > 0) |
| 185 | { | 187 | { |