From 6412349decb36a7278528477bacb5b71534ad657 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Thu, 22 Dec 2011 16:51:51 +0000
Subject: [PATCH] Add a few comments, correct a merge artefact

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c578fc02f7..fc6eb6d73d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -570,6 +570,8 @@ namespace OpenSim.Region.Framework.Scenes
         public Vector3 OffsetPosition
         {
             get { return m_pos; }
+            // Don't remove setter. It's not currently used in core but
+            // upcoming Avination code needs it.
             set
             {
                 // There is no offset position when not seated
@@ -2751,7 +2753,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (IsChildAgent) 
                 return;
 
-            if (ParentID != 0)
+            // If we don't have a PhysActor, we can't cross anyway
+            // Also don't do this while sat, sitting avatars cross with the
+            // object they sit on.
+            if (ParentID != 0 || PhysActor == null)
                 return;
 
             if (!IsInTransit)