aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-04 23:24:22 +0000
committerJustin Clark-Casey (justincc)2011-11-04 23:24:22 +0000
commitd7815ace4a502926a06f4fb5ed20b0d05db42591 (patch)
tree3529ee0f354dba7c62e04c3af1c3812a820ab6a7 /OpenSim/Region/Framework/Scenes
parentStop llPushObject() from causing problems by adding force via a taint rather ... (diff)
downloadopensim-SC_OLD-d7815ace4a502926a06f4fb5ed20b0d05db42591.zip
opensim-SC_OLD-d7815ace4a502926a06f4fb5ed20b0d05db42591.tar.gz
opensim-SC_OLD-d7815ace4a502926a06f4fb5ed20b0d05db42591.tar.bz2
opensim-SC_OLD-d7815ace4a502926a06f4fb5ed20b0d05db42591.tar.xz
On standup, trigger the changed link script event after the avatar has been fully changed.
This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work. Probably the event is fired before the physics actor has been set up again for the stood avatar. Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f6df3c3..89e511f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1864,8 +1864,6 @@ namespace OpenSim.Region.Framework.Scenes
1864 if (part.SitTargetAvatar == UUID) 1864 if (part.SitTargetAvatar == UUID)
1865 part.SitTargetAvatar = UUID.Zero; 1865 part.SitTargetAvatar = UUID.Zero;
1866 1866
1867 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1868
1869 ParentPosition = part.GetWorldPosition(); 1867 ParentPosition = part.GetWorldPosition();
1870 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 1868 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
1871 } 1869 }
@@ -1881,6 +1879,9 @@ namespace OpenSim.Region.Framework.Scenes
1881 ParentID = 0; 1879 ParentID = 0;
1882 SendAvatarDataToAllAgents(); 1880 SendAvatarDataToAllAgents();
1883 m_requestedSitTargetID = 0; 1881 m_requestedSitTargetID = 0;
1882
1883 if (part != null)
1884 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1884 } 1885 }
1885 1886
1886 Animator.TrySetMovementAnimation("STAND"); 1887 Animator.TrySetMovementAnimation("STAND");