aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2016-08-21 00:02:31 +0100
committerUbitUmarov2016-08-21 00:02:31 +0100
commit3337ebe93c5b88a459e458b720cde055d675d8bd (patch)
tree05487dc6aa38e3145acda897da5a9c089e96ff10 /OpenSim
parent fix llCollisionSound("",0.0) not disabling sounds BUT let llCollisionSound("... (diff)
downloadopensim-SC_OLD-3337ebe93c5b88a459e458b720cde055d675d8bd.zip
opensim-SC_OLD-3337ebe93c5b88a459e458b720cde055d675d8bd.tar.gz
opensim-SC_OLD-3337ebe93c5b88a459e458b720cde055d675d8bd.tar.bz2
opensim-SC_OLD-3337ebe93c5b88a459e458b720cde055d675d8bd.tar.xz
make the case llCollisionSound("",1.0) more clear its retunring to default sounds, ie like a prim that never had this funtion called.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 3 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 fc9b5d9..7931ff5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5120,8 +5120,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5120 m_host.CollisionSound = m_host.invalidCollisionSoundUUID; 5120 m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
5121 if(impact_volume == 0.0) 5121 if(impact_volume == 0.0)
5122 m_host.CollisionSoundType = -1; // disable all sounds 5122 m_host.CollisionSoundType = -1; // disable all sounds
5123 else if(impact_volume == 1.0f)
5124 m_host.CollisionSoundType = 0; // full return to default sounds
5123 else 5125 else
5124 m_host.CollisionSoundType = 2; // allow change of default sounds volume 5126 m_host.CollisionSoundType = 2; // default sounds with volume
5125 return; 5127 return;
5126 } 5128 }
5127 // TODO: Parameter check logic required. 5129 // TODO: Parameter check logic required.