diff options
author | UbitUmarov | 2017-07-10 13:48:28 +0100 |
---|---|---|
committer | UbitUmarov | 2017-07-10 13:48:28 +0100 |
commit | 63e3fc21efa1089bf90ff2aa703128e8955d9aed (patch) | |
tree | 1f68101e32430166d6c326250ac324a938cdb995 | |
parent | throttle collision sounds on a SOG. (diff) | |
download | opensim-SC_OLD-63e3fc21efa1089bf90ff2aa703128e8955d9aed.zip opensim-SC_OLD-63e3fc21efa1089bf90ff2aa703128e8955d9aed.tar.gz opensim-SC_OLD-63e3fc21efa1089bf90ff2aa703128e8955d9aed.tar.bz2 opensim-SC_OLD-63e3fc21efa1089bf90ff2aa703128e8955d9aed.tar.xz |
fix the name of a funtion on last commit
-rw-r--r-- | OpenSim/Region/Framework/Scenes/CollisionSounds.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs index f87043e..63aafcd 100644 --- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs +++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs | |||
@@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
129 | if (sog == null || sog.IsDeleted || sog.inTransit) | 129 | if (sog == null || sog.IsDeleted || sog.inTransit) |
130 | return; | 130 | return; |
131 | 131 | ||
132 | if(sog.CollisionSoundThrootled(part.CollisionSoundType)) | 132 | if(sog.CollisionSoundThrottled(part.CollisionSoundType)) |
133 | return; | 133 | return; |
134 | 134 | ||
135 | float volume = part.CollisionSoundVolume; | 135 | float volume = part.CollisionSoundVolume; |
@@ -206,7 +206,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
206 | 206 | ||
207 | if (!HaveSound) | 207 | if (!HaveSound) |
208 | { | 208 | { |
209 | if(othersog.CollisionSoundThrootled(otherType)) | 209 | if(othersog.CollisionSoundThrottled(otherType)) |
210 | continue; | 210 | continue; |
211 | 211 | ||
212 | if (otherType == 1) | 212 | if (otherType == 1) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index bf915e0..c4b768b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -5530,7 +5530,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5530 | } | 5530 | } |
5531 | } | 5531 | } |
5532 | 5532 | ||
5533 | public bool CollisionSoundThrootled(int collisionSoundType) | 5533 | public bool CollisionSoundThrottled(int collisionSoundType) |
5534 | { | 5534 | { |
5535 | double time = m_lastCollisionSoundMS; | 5535 | double time = m_lastCollisionSoundMS; |
5536 | // m_lastCollisionSoundMS = Util.GetTimeStampMS(); | 5536 | // m_lastCollisionSoundMS = Util.GetTimeStampMS(); |