diff options
| author | Melanie | 2011-10-11 23:28:16 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 23:28:16 +0100 |
| commit | 0b96991ab40ba31d2b3de5455c4dbb99a01ac0a3 (patch) | |
| tree | 4650b765500cdb5ce6be7b25c855057cb072ca8a /OpenSim | |
| parent | Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge (diff) | |
| parent | trival tweak to trigger the continuous integration system (diff) | |
| download | opensim-SC_OLD-0b96991ab40ba31d2b3de5455c4dbb99a01ac0a3.zip opensim-SC_OLD-0b96991ab40ba31d2b3de5455c4dbb99a01ac0a3.tar.gz opensim-SC_OLD-0b96991ab40ba31d2b3de5455c4dbb99a01ac0a3.tar.bz2 opensim-SC_OLD-0b96991ab40ba31d2b3de5455c4dbb99a01ac0a3.tar.xz | |
Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 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 6b35716..b968bdc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4675,8 +4675,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4675 | 4675 | ||
| 4676 | public void llCollisionSound(string impact_sound, double impact_volume) | 4676 | public void llCollisionSound(string impact_sound, double impact_volume) |
| 4677 | { | 4677 | { |
| 4678 | |||
| 4679 | m_host.AddScriptLPS(1); | 4678 | m_host.AddScriptLPS(1); |
| 4679 | |||
| 4680 | // TODO: Parameter check logic required. | 4680 | // TODO: Parameter check logic required. |
| 4681 | UUID soundId = UUID.Zero; | 4681 | UUID soundId = UUID.Zero; |
| 4682 | if (!UUID.TryParse(impact_sound, out soundId)) | 4682 | if (!UUID.TryParse(impact_sound, out soundId)) |