ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-02-15 00:20:48 +00:00
parent d326a1df3f 2c0c21d0a5
commit c033223c63
60 changed files with 1674 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
View File

@@ -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

4
OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
View File

@@ -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);
}
}