aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
diff options
context:
space:
mode:
authorKitto Flora2010-03-12 13:48:31 -0500
committerKitto Flora2010-03-12 13:48:31 -0500
commit7bd48d383d3383c1e633f76f76a5291f4224d48a (patch)
tree18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
parentDynamics Integration Part 1 (diff)
parentSmall consistency change (diff)
downloadopensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip
opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz
opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2
opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz
Resolved merge
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs2
1 files changed, 1 insertions, 1 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