diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f64d539..30c9365 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1703,7 +1703,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1703 | } | 1703 | } |
1704 | // Reset sit target. | 1704 | // Reset sit target. |
1705 | if (part.GetAvatarOnSitTarget() == UUID) | 1705 | if (part.GetAvatarOnSitTarget() == UUID) |
1706 | part.SetAvatarOnSitTarget(UUID.Zero); | 1706 | part.SitTargetAvatar = UUID.Zero; |
1707 | if (part.ParentGroup != null) | ||
1708 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); | ||
1707 | 1709 | ||
1708 | m_parentPosition = part.GetWorldPosition(); | 1710 | m_parentPosition = part.GetWorldPosition(); |
1709 | ControllingClient.SendClearFollowCamProperties(part.ParentUUID); | 1711 | ControllingClient.SendClearFollowCamProperties(part.ParentUUID); |
@@ -1807,11 +1809,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1807 | 1809 | ||
1808 | if (SitTargetisSet && SitTargetUnOccupied) | 1810 | if (SitTargetisSet && SitTargetUnOccupied) |
1809 | { | 1811 | { |
1810 | part.SetAvatarOnSitTarget(UUID); | 1812 | part.SitTargetAvatar = UUID; |
1811 | offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); | 1813 | offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); |
1812 | sitOrientation = avSitOrientation; | 1814 | sitOrientation = avSitOrientation; |
1813 | autopilot = false; | 1815 | autopilot = false; |
1814 | } | 1816 | } |
1817 | if (part.ParentGroup != null) | ||
1818 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); | ||
1815 | 1819 | ||
1816 | pos = part.AbsolutePosition + offset; | 1820 | pos = part.AbsolutePosition + offset; |
1817 | //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1) | 1821 | //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1) |