Merge branch 'master' into careminster-presence-refactor

Also fix the failure to fire CHANGED_LINK on sit, which is different in our
code.

1 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6ad6522..d83ff51 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1837,8 +1837,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // Reset sit target.
                     if (part.GetAvatarOnSitTarget() == UUID)
                         part.SitTargetAvatar = UUID.Zero;
-                    if (part.ParentGroup != null)
-                        part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
+                    part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
 
                     m_parentPosition = part.GetWorldPosition();
                     ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
@@ -2033,6 +2032,9 @@ namespace OpenSim.Region.Framework.Scenes
                         else return;            // occupied small
                 }       // end large/small
             } // end Scripted/not
+
+            part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
+
             cameraAtOffset = part.GetCameraAtOffset();
             cameraEyeOffset = part.GetCameraEyeOffset();
             forceMouselook = part.GetForceMouselook();