diff options
| author | Melanie | 2012-05-28 11:28:46 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-28 11:28:46 +0200 |
| commit | b70fb7df789ba40b520b8bf0794b32c8099ef202 (patch) | |
| tree | 997674292d0ab366c54d40c26291cfa742f93ec3 /OpenSim/Region/Framework/Scenes | |
| parent | If a region is not found on a simulator, make the health query return (diff) | |
| download | opensim-SC_OLD-b70fb7df789ba40b520b8bf0794b32c8099ef202.zip opensim-SC_OLD-b70fb7df789ba40b520b8bf0794b32c8099ef202.tar.gz opensim-SC_OLD-b70fb7df789ba40b520b8bf0794b32c8099ef202.tar.bz2 opensim-SC_OLD-b70fb7df789ba40b520b8bf0794b32c8099ef202.tar.xz | |
Place the return back into collision sounds.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/CollisionSounds.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs index 81ca9f1..a02f108 100644 --- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs +++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs | |||
| @@ -188,6 +188,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 188 | 188 | ||
| 189 | public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist) | 189 | public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist) |
| 190 | { | 190 | { |
| 191 | return; | ||
| 192 | |||
| 191 | if (collidersinfolist.Count == 0 || part == null) | 193 | if (collidersinfolist.Count == 0 || part == null) |
| 192 | return; | 194 | return; |
| 193 | 195 | ||
| @@ -297,6 +299,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 297 | 299 | ||
| 298 | public static void AvatarCollisionSound(ScenePresence av, List<CollisionForSoundInfo> collidersinfolist) | 300 | public static void AvatarCollisionSound(ScenePresence av, List<CollisionForSoundInfo> collidersinfolist) |
| 299 | { | 301 | { |
| 302 | return; | ||
| 303 | |||
| 300 | if (collidersinfolist.Count == 0 || av == null) | 304 | if (collidersinfolist.Count == 0 || av == null) |
| 301 | return; | 305 | return; |
| 302 | 306 | ||