diff options
author | Melanie | 2011-11-04 23:21:19 +0000 |
---|---|---|
committer | Melanie | 2011-11-04 23:21:19 +0000 |
commit | b9f7aebde3d6f22be2516606093009a85f81bd3c (patch) | |
tree | 720286587716b0f681d207fe2be52f44bcf5083a /OpenSim/Region/Framework | |
parent | Merge branch 'master' into bigmerge (diff) | |
parent | On standup, trigger the changed link script event after the avatar has been f... (diff) | |
download | opensim-SC-b9f7aebde3d6f22be2516606093009a85f81bd3c.zip opensim-SC-b9f7aebde3d6f22be2516606093009a85f81bd3c.tar.gz opensim-SC-b9f7aebde3d6f22be2516606093009a85f81bd3c.tar.bz2 opensim-SC-b9f7aebde3d6f22be2516606093009a85f81bd3c.tar.xz |
Merge branch 'master' into bigmerge
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
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 | |||
1997 | if (part.SitTargetAvatar == UUID) | 1997 | if (part.SitTargetAvatar == UUID) |
1998 | part.SitTargetAvatar = UUID.Zero; | 1998 | part.SitTargetAvatar = UUID.Zero; |
1999 | 1999 | ||
2000 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); | ||
2001 | |||
2002 | ParentPosition = part.GetWorldPosition(); | 2000 | ParentPosition = part.GetWorldPosition(); |
2003 | ControllingClient.SendClearFollowCamProperties(part.ParentUUID); | 2001 | ControllingClient.SendClearFollowCamProperties(part.ParentUUID); |
2004 | } | 2002 | } |
@@ -2052,6 +2050,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2052 | m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f); | 2050 | m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f); |
2053 | SendAvatarDataToAllAgents(); | 2051 | SendAvatarDataToAllAgents(); |
2054 | m_requestedSitTargetID = 0; | 2052 | m_requestedSitTargetID = 0; |
2053 | |||
2054 | if (part != null) | ||
2055 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); | ||
2055 | } | 2056 | } |
2056 | 2057 | ||
2057 | Animator.UpdateMovementAnimations(); | 2058 | Animator.UpdateMovementAnimations(); |