From 5dcbbb726a15bc14da76b59577d009c25ad5e4e1 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 8 Oct 2010 18:40:13 +0100
Subject: Change the order of actions to address a possible nullref

---
 OpenSim/Region/Framework/Scenes/SceneViewer.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index b45291f..e6f7235 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -179,11 +179,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void Reset()
         {
-            if (m_pendingObjects != null)
+            lock (m_pendingObjects)
             {
-                lock (m_pendingObjects)
+                if (m_pendingObjects != null)
                 {
-
                     m_pendingObjects.Clear();
                     m_pendingObjects = null;
                 }
-- 
cgit v1.1


From 4a0911bdbd3429d88b448bd324d8813cf6023e64 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 8 Oct 2010 19:19:07 +0100
Subject: Guard against locking a nullref to avoid build break

---
 OpenSim/Region/Framework/Scenes/SceneViewer.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index e6f7235..b44a010 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -179,6 +179,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void Reset()
         {
+            if (m_pendingObjects == null)
+                return;
+
             lock (m_pendingObjects)
             {
                 if (m_pendingObjects != null)
-- 
cgit v1.1


From f2febb89fc8eee4977d965eeb24bd576cc8fb933 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 10 Oct 2010 22:06:47 +0100
Subject: Change the part for sound playback to be the root part / object UUID
 instead of the child prim because using the child prim plain doesn't work.

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

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8140d42..39b109b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2694,7 +2694,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void PreloadSound(string sound)
         {
             // UUID ownerID = OwnerID;
-            UUID objectID = UUID;
+            UUID objectID = ParentGroup.RootPart.UUID;
             UUID soundID = UUID.Zero;
 
             if (!UUID.TryParse(sound, out soundID))
@@ -3101,7 +3101,7 @@ namespace OpenSim.Region.Framework.Scenes
                 volume = 0;
 
             UUID ownerID = _ownerID;
-            UUID objectID = UUID;
+            UUID objectID = ParentGroup.RootPart.UUID;
             UUID parentID = GetRootPartUUID();
             UUID soundID = UUID.Zero;
             Vector3 position = AbsolutePosition; // region local
@@ -3138,11 +3138,11 @@ namespace OpenSim.Region.Framework.Scenes
                         else
                             soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
                         ParentGroup.PlaySoundMasterPrim = this;
-                        ownerID = this._ownerID;
-                        objectID = this.UUID;
-                        parentID = this.GetRootPartUUID();
-                        position = this.AbsolutePosition; // region local
-                        regionHandle = this.ParentGroup.Scene.RegionInfo.RegionHandle;
+                        ownerID = _ownerID;
+                        objectID = ParentGroup.RootPart.UUID;
+                        parentID = GetRootPartUUID();
+                        position = AbsolutePosition; // region local
+                        regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle;
                         if (triggered)
                             soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
                         else
@@ -3150,7 +3150,7 @@ namespace OpenSim.Region.Framework.Scenes
                         foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims)
                         {
                             ownerID = prim._ownerID;
-                            objectID = prim.UUID;
+                            objectID = prim.ParentGroup.RootPart.UUID;
                             parentID = prim.GetRootPartUUID();
                             position = prim.AbsolutePosition; // region local
                             regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle;
-- 
cgit v1.1