diff options
| author | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
| commit | 4c90ee29432539efbf5942010dd574822235ed57 (patch) | |
| tree | d159f72df97dfef5719221301009e90f375f2ef2 /OpenSim/Region/OptionalModules/Scripting | |
| parent | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-4c90ee29432539efbf5942010dd574822235ed57.zip opensim-SC-4c90ee29432539efbf5942010dd574822235ed57.tar.gz opensim-SC-4c90ee29432539efbf5942010dd574822235ed57.tar.bz2 opensim-SC-4c90ee29432539efbf5942010dd574822235ed57.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs | 4 |
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 | |||
| 767 | if (!CanEdit()) | 767 | if (!CanEdit()) |
| 768 | return; | 768 | return; |
| 769 | 769 | ||
| 770 | GetSOP().SendSound(asset.ToString(), volume, true, 0); | 770 | GetSOP().SendSound(asset.ToString(), volume, true, 0, 0, false, false); |
| 771 | } | 771 | } |
| 772 | 772 | ||
| 773 | #endregion | 773 | #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 | |||
| 231 | if (soundModule != null) | 231 | if (soundModule != null) |
| 232 | { | 232 | { |
| 233 | soundModule.TriggerSound(audio, UUID.Zero, UUID.Zero, UUID.Zero, volume, position, | 233 | soundModule.TriggerSound(audio, UUID.Zero, UUID.Zero, UUID.Zero, volume, position, |
| 234 | m_internalScene.RegionInfo.RegionHandle); | 234 | m_internalScene.RegionInfo.RegionHandle, 0); |
| 235 | } | 235 | } |
| 236 | } | 236 | } |
| 237 | 237 | ||
| @@ -241,7 +241,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
| 241 | if (soundModule != null) | 241 | if (soundModule != null) |
| 242 | { | 242 | { |
| 243 | soundModule.TriggerSound(audio, UUID.Zero, UUID.Zero, UUID.Zero, 1.0, position, | 243 | soundModule.TriggerSound(audio, UUID.Zero, UUID.Zero, UUID.Zero, 1.0, position, |
| 244 | m_internalScene.RegionInfo.RegionHandle); | 244 | m_internalScene.RegionInfo.RegionHandle, 0); |
| 245 | } | 245 | } |
| 246 | } | 246 | } |
| 247 | 247 | ||