aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-11-10 20:26:14 +0100
committerMelanie2011-11-10 20:54:15 +0000
commit48d2300b8a762f6fba1e6741c69e975b358bbc36 (patch)
treea688afd9eca7bb8bb116fd07657baf1763c817c2 /OpenSim
parentAdd GuduleLapointe to list of contributors (diff)
downloadopensim-SC_OLD-48d2300b8a762f6fba1e6741c69e975b358bbc36.zip
opensim-SC_OLD-48d2300b8a762f6fba1e6741c69e975b358bbc36.tar.gz
opensim-SC_OLD-48d2300b8a762f6fba1e6741c69e975b358bbc36.tar.bz2
opensim-SC_OLD-48d2300b8a762f6fba1e6741c69e975b358bbc36.tar.xz
Fix misaligned sit animation on scripted sit caused by the default sit
animation being run after the scripted one.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 99be46d..fc5141f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2013,8 +2013,6 @@ namespace OpenSim.Region.Framework.Scenes
2013 sitOrientation = avSitOrientation; 2013 sitOrientation = avSitOrientation;
2014 autopilot = false; 2014 autopilot = false;
2015 } 2015 }
2016 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
2017
2018 pos = part.AbsolutePosition + offset; 2016 pos = part.AbsolutePosition + offset;
2019 //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1) 2017 //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1)
2020 //{ 2018 //{
@@ -2060,6 +2058,12 @@ namespace OpenSim.Region.Framework.Scenes
2060 m_sitAtAutoTarget = autopilot; 2058 m_sitAtAutoTarget = autopilot;
2061 if (!autopilot) 2059 if (!autopilot)
2062 HandleAgentSit(remoteClient, UUID); 2060 HandleAgentSit(remoteClient, UUID);
2061
2062 // Moved here to avoid a race with default sit anim
2063 // The script event needs to be raised after the default sit anim is set.
2064 if (part != null)
2065 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
2066
2063 } 2067 }
2064 2068
2065 // public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset, string sitAnimation) 2069 // public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset, string sitAnimation)