aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSignpostMarv2012-10-15 14:05:17 +0100
committerJustin Clark-Casey (justincc)2012-10-29 23:38:59 +0000
commit22693304fb3cfbb8d073c48affd2e56453dd2b2f (patch)
treef48362035b2272dfc0de60e16faec40b720a24c8
parentrefactoring StopSound into a private static method to skip repeating m_scene.... (diff)
downloadopensim-SC_OLD-22693304fb3cfbb8d073c48affd2e56453dd2b2f.zip
opensim-SC_OLD-22693304fb3cfbb8d073c48affd2e56453dd2b2f.tar.gz
opensim-SC_OLD-22693304fb3cfbb8d073c48affd2e56453dd2b2f.tar.bz2
opensim-SC_OLD-22693304fb3cfbb8d073c48affd2e56453dd2b2f.tar.xz
removing superfluous lines from SceneObjectPart.SendSound
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs8
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 48615de..681c725 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2695,11 +2695,6 @@ namespace OpenSim.Region.Framework.Scenes
2695 else 2695 else
2696 soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); 2696 soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
2697 ParentGroup.PlaySoundMasterPrim = this; 2697 ParentGroup.PlaySoundMasterPrim = this;
2698 ownerID = OwnerID;
2699 objectID = ParentGroup.RootPart.UUID;
2700 parentID = ParentGroup.UUID;
2701 position = AbsolutePosition; // region local
2702 regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle;
2703 if (triggered) 2698 if (triggered)
2704 soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); 2699 soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
2705 else 2700 else
@@ -2707,10 +2702,7 @@ namespace OpenSim.Region.Framework.Scenes
2707 foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims) 2702 foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims)
2708 { 2703 {
2709 ownerID = prim.OwnerID; 2704 ownerID = prim.OwnerID;
2710 objectID = prim.ParentGroup.RootPart.UUID;
2711 parentID = prim.ParentGroup.UUID;
2712 position = prim.AbsolutePosition; // region local 2705 position = prim.AbsolutePosition; // region local
2713 regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle;
2714 if (triggered) 2706 if (triggered)
2715 soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); 2707 soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
2716 else 2708 else