Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge

This commit is contained in:
Melanie
2011-10-11 23:28:16 +01:00

View File

@@ -4675,8 +4675,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llCollisionSound(string impact_sound, double impact_volume)
{
m_host.AddScriptLPS(1);
// TODO: Parameter check logic required.
UUID soundId = UUID.Zero;
if (!UUID.TryParse(impact_sound, out soundId))