aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting
diff options
context:
space:
mode:
authorMelanie2012-10-30 01:02:20 +0000
committerMelanie2012-10-30 01:02:20 +0000
commit48569e856a9c9ced207652b10e2abde94c849687 (patch)
tree8955c0206f1822f4bbb44466fae74e18923d125c /OpenSim/Region/OptionalModules/Scripting
parentMerge branch 'avination' into careminster (diff)
parentMake MeshAssetReceived private. (diff)
downloadopensim-SC-48569e856a9c9ced207652b10e2abde94c849687.zip
opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.gz
opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.bz2
opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-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..5ed1514 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, volume, true, 0, 0, false, false);
828 }
826 } 829 }
827 830
828 #endregion 831 #endregion