From 57940087d125cf817d1d2492145dc224439434ad Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Mon, 15 Oct 2012 15:09:45 +0100
Subject: Factoring out a superfluous local variable & repeated assignment in
 SceneObjectPart.SendSound as linksets are only meant to have a single owner

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 681c725..240cfa5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2659,7 +2659,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             volume = Util.Clip((float)volume, 0, 1);
 
-            UUID ownerID = OwnerID;
             UUID objectID = ParentGroup.RootPart.UUID;
             UUID parentID = ParentGroup.UUID;
 
@@ -2691,22 +2690,21 @@ namespace OpenSim.Region.Framework.Scenes
                 if (isMaster)
                 {
                     if (triggered)
-                        soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
+                        soundModule.TriggerSound(soundID, OwnerID, objectID, parentID, volume, position, regionHandle, radius);
                     else
-                        soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
+                        soundModule.PlayAttachedSound(soundID, OwnerID, objectID, volume, position, flags, radius);
                     ParentGroup.PlaySoundMasterPrim = this;
                     if (triggered)
-                        soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
+                        soundModule.TriggerSound(soundID, OwnerID, objectID, parentID, volume, position, regionHandle, radius);
                     else
-                        soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
+                        soundModule.PlayAttachedSound(soundID, OwnerID, objectID, volume, position, flags, radius);
                     foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims)
                     {
-                        ownerID = prim.OwnerID;
                         position = prim.AbsolutePosition; // region local
                         if (triggered)
-                            soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
+                            soundModule.TriggerSound(soundID, OwnerID, objectID, parentID, volume, position, regionHandle, radius);
                         else
-                            soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
+                            soundModule.PlayAttachedSound(soundID, OwnerID, objectID, volume, position, flags, radius);
                     }
                     ParentGroup.PlaySoundSlavePrims.Clear();
                     ParentGroup.PlaySoundMasterPrim = null;
@@ -2719,9 +2717,9 @@ namespace OpenSim.Region.Framework.Scenes
             else
             {
                 if (triggered)
-                    soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
+                    soundModule.TriggerSound(soundID, OwnerID, objectID, parentID, volume, position, regionHandle, radius);
                 else
-                    soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
+                    soundModule.PlayAttachedSound(soundID, OwnerID, objectID, volume, position, flags, radius);
             }
         }
 
-- 
cgit v1.1