Merge branch 'master' into bigmerge

1 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9bf5bea..1c892fe 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1997,8 +1997,6 @@ namespace OpenSim.Region.Framework.Scenes
                     if (part.SitTargetAvatar == UUID)
                         part.SitTargetAvatar = UUID.Zero;
 
-                    part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
-
                     ParentPosition = part.GetWorldPosition();
                     ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
                 }
@@ -2052,6 +2050,9 @@ namespace OpenSim.Region.Framework.Scenes
                 m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
                 SendAvatarDataToAllAgents();
                 m_requestedSitTargetID = 0;
+
+                if (part != null)
+                    part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
             }
 
             Animator.UpdateMovementAnimations();