diff options
| author | Melanie | 2012-06-07 23:34:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-07 23:34:22 +0100 |
| commit | 69dd5b855adb8178cc1057a645a2a6d433c2dc0f (patch) | |
| tree | 392a996bd1aeab76743288fcfd7300a1a58faac1 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Implement playing of the real collision sounds, change scaling for avatar (diff) | |
| download | opensim-SC-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.zip opensim-SC-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.gz opensim-SC-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.bz2 opensim-SC-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
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 e0b24dc..6af3c1e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4644,6 +4644,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4644 | { | 4644 | { |
| 4645 | m_host.CollisionSoundVolume = (float)impact_volume; | 4645 | m_host.CollisionSoundVolume = (float)impact_volume; |
| 4646 | m_host.CollisionSound = m_host.invalidCollisionSoundUUID; | 4646 | m_host.CollisionSound = m_host.invalidCollisionSoundUUID; |
| 4647 | m_host.CollisionSoundType = 0; | ||
| 4647 | return; | 4648 | return; |
| 4648 | } | 4649 | } |
| 4649 | // TODO: Parameter check logic required. | 4650 | // TODO: Parameter check logic required. |
| @@ -4663,6 +4664,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4663 | } | 4664 | } |
| 4664 | m_host.CollisionSoundVolume = (float)impact_volume; | 4665 | m_host.CollisionSoundVolume = (float)impact_volume; |
| 4665 | m_host.CollisionSound = soundId; | 4666 | m_host.CollisionSound = soundId; |
| 4667 | m_host.CollisionSoundType = 1; | ||
| 4666 | } | 4668 | } |
| 4667 | 4669 | ||
| 4668 | public LSL_String llGetAnimation(string id) | 4670 | public LSL_String llGetAnimation(string id) |