From e74bf4600759c3fee6aa62ee808bbf214c019b6d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 23 Feb 2012 23:18:01 +0100
Subject: Prevent a nullref when nonphysical motion objects cross sim
 boundaries

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index cf8637f..248d4c6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -582,7 +582,7 @@ namespace OpenSim.Region.Framework.Scenes
                     foreach (ScenePresence av in m_linkedAvatars)
                     {
                         SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID);
-                        if (m_parts.TryGetValue(p.UUID, out p))
+                        if (p != null && m_parts.TryGetValue(p.UUID, out p))
                         {
                             Vector3 offset = p.GetWorldPosition() - av.ParentPosition;
                             av.AbsolutePosition += offset;
-- 
cgit v1.1