Merge branch 'master' into presence-refactor

2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index 31f28e0..5bfe4be 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -767,7 +767,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             if (!CanEdit())
                 return;
 
-            GetSOP().SendSound(asset.ToString(), volume, true, 0);
+            GetSOP().SendSound(asset.ToString(), volume, true, 0, 0, false, false);
         }
 
         #endregion
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
index c7cd37b..45bb005 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
@@ -231,7 +231,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             if (soundModule != null)
             {
                 soundModule.TriggerSound(audio, UUID.Zero, UUID.Zero, UUID.Zero, volume, position,
-                                         m_internalScene.RegionInfo.RegionHandle);
+                                         m_internalScene.RegionInfo.RegionHandle, 0);
             }
         }
 
@@ -241,7 +241,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             if (soundModule != null)
             {
                 soundModule.TriggerSound(audio, UUID.Zero, UUID.Zero, UUID.Zero, 1.0, position,
-                                         m_internalScene.RegionInfo.RegionHandle);
+                                         m_internalScene.RegionInfo.RegionHandle, 0);
             }
         }