aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorSignpostMarv2012-10-16 12:24:33 +0100
committerJustin Clark-Casey (justincc)2012-10-29 23:39:00 +0000
commit5abcecc7356bf58c479a7cff86581131a6ab3c9e (patch)
tree73a621d699527ada735b8518cd32074858f0c3c9 /OpenSim/Region/OptionalModules
parentfixing a bug in SceneObjectPart.SendSound where sounds would always come from... (diff)
downloadopensim-SC_OLD-5abcecc7356bf58c479a7cff86581131a6ab3c9e.zip
opensim-SC_OLD-5abcecc7356bf58c479a7cff86581131a6ab3c9e.tar.gz
opensim-SC_OLD-5abcecc7356bf58c479a7cff86581131a6ab3c9e.tar.bz2
opensim-SC_OLD-5abcecc7356bf58c479a7cff86581131a6ab3c9e.tar.xz
moving SendSound from SceneObjectPart to ISoundModule
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index aa23fee..9e438e2 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -821,8 +821,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
821 { 821 {
822 if (!CanEdit()) 822 if (!CanEdit())
823 return; 823 return;
824 824 ISoundModule module = m_rootScene.RequestModuleInterface<ISoundModule>();
825 GetSOP().SendSound(asset.ToString(), volume, true, 0, 0, false, false); 825 if (module != null)
826 {
827 module.SendSound(GetSOP().UUID, asset.ToString(), volume, true, 0, 0, false, false);
828 }
826 } 829 }
827 830
828 #endregion 831 #endregion