aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorUbitUmarov2016-08-20 23:41:32 +0100
committerUbitUmarov2016-08-20 23:41:32 +0100
commit04dd2a979546c7fc2d3c8c06634a2d0ed2f5f6c0 (patch)
tree79c5f0e5e28a50544cf4326ca9966ccb7c0f59b2 /OpenSim/Region/ScriptEngine
parentMantis #8000, don't charge for updating classifieds. Thanks, Cinder! (diff)
downloadopensim-SC-04dd2a979546c7fc2d3c8c06634a2d0ed2f5f6c0.zip
opensim-SC-04dd2a979546c7fc2d3c8c06634a2d0ed2f5f6c0.tar.gz
opensim-SC-04dd2a979546c7fc2d3c8c06634a2d0ed2f5f6c0.tar.bz2
opensim-SC-04dd2a979546c7fc2d3c8c06634a2d0ed2f5f6c0.tar.xz
fix llCollisionSound("",0.0) not disabling sounds BUT let llCollisionSound("",value [<=1.0]) play default sounds with selected volume. I really don't care if last part is not like SL
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ce0e59c..fc9b5d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5118,7 +5118,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5118 { 5118 {
5119 m_host.CollisionSoundVolume = (float)impact_volume; 5119 m_host.CollisionSoundVolume = (float)impact_volume;
5120 m_host.CollisionSound = m_host.invalidCollisionSoundUUID; 5120 m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
5121 m_host.CollisionSoundType = 0; 5121 if(impact_volume == 0.0)
5122 m_host.CollisionSoundType = -1; // disable all sounds
5123 else
5124 m_host.CollisionSoundType = 2; // allow change of default sounds volume
5122 return; 5125 return;
5123 } 5126 }
5124 // TODO: Parameter check logic required. 5127 // TODO: Parameter check logic required.