Merge branch 'master' into careminster-presence-refactor

2 files changed, 5 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index db60ae3..a109d68 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3264,13 +3264,6 @@ namespace OpenSim.Region.Framework.Scenes
             //}
         }
 
-        public void SetAvatarOnSitTarget(UUID avatarID)
-        {
-            m_sitTargetAvatar = avatarID;
-            if (ParentGroup != null)
-                ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
-        }
-
         public void SetAxisRotation(int axis, int rotate)
         {
             if (m_parentGroup != null)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 961fe29..6ad6522 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1836,7 +1836,10 @@ namespace OpenSim.Region.Framework.Scenes
                     part.TaskInventory.LockItemsForRead(false);
                     // Reset sit target.
                     if (part.GetAvatarOnSitTarget() == UUID)
-                        part.SetAvatarOnSitTarget(UUID.Zero);
+                        part.SitTargetAvatar = UUID.Zero;
+                    if (part.ParentGroup != null)
+                        part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
+
                     m_parentPosition = part.GetWorldPosition();
                     ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
                 }
@@ -1986,7 +1989,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 if (!part.IsOccupied)
                                 {
 //Console.WriteLine("Scripted, unoccupied");
-                    part.SetAvatarOnSitTarget(UUID);            // set that Av will be on it
+                    part.SitTargetAvatar = UUID;                // set that Av will be on it
                     offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z);  // change ofset to the scripted one
 
                     Quaternion nrot = avSitOrientation;