aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-06-07 17:59:20 +0200
committerMelanie2012-06-07 17:59:20 +0200
commit91557f18cd796e64158d2e3dbdef28d0b3927d1b (patch)
tree2589016e58b3b288fc2d4396ab0d73627f139133 /OpenSim
parentMake the "delay restart" button delay restart for 1 hour rather than aborting (diff)
downloadopensim-SC_OLD-91557f18cd796e64158d2e3dbdef28d0b3927d1b.zip
opensim-SC_OLD-91557f18cd796e64158d2e3dbdef28d0b3927d1b.tar.gz
opensim-SC_OLD-91557f18cd796e64158d2e3dbdef28d0b3927d1b.tar.bz2
opensim-SC_OLD-91557f18cd796e64158d2e3dbdef28d0b3927d1b.tar.xz
Set collision sound type so custom sound types are recognized
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a51c625..37738a5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4812,6 +4812,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4812 { 4812 {
4813 m_host.CollisionSoundVolume = (float)impact_volume; 4813 m_host.CollisionSoundVolume = (float)impact_volume;
4814 m_host.CollisionSound = m_host.invalidCollisionSoundUUID; 4814 m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
4815 m_host,CollisionSoundType = 0;
4815 return; 4816 return;
4816 } 4817 }
4817 // TODO: Parameter check logic required. 4818 // TODO: Parameter check logic required.
@@ -4831,6 +4832,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4831 } 4832 }
4832 m_host.CollisionSoundVolume = (float)impact_volume; 4833 m_host.CollisionSoundVolume = (float)impact_volume;
4833 m_host.CollisionSound = soundId; 4834 m_host.CollisionSound = soundId;
4835 m_host.CollisionSoundType = 1;
4834 } 4836 }
4835 4837
4836 public LSL_String llGetAnimation(string id) 4838 public LSL_String llGetAnimation(string id)