aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDan Lake2011-11-10 14:09:53 -0800
committerDan Lake2011-11-10 14:09:53 -0800
commitf3fea81936bd1c5bb2963bd20c1f8753716848de (patch)
tree69492bae46ef44aaa1cf72484a8edb1a082eb89e /OpenSim/Region/Framework/Scenes
parentWhen updating SOG, a physics taint should not override a full update with a t... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-f3fea81936bd1c5bb2963bd20c1f8753716848de.zip
opensim-SC_OLD-f3fea81936bd1c5bb2963bd20c1f8753716848de.tar.gz
opensim-SC_OLD-f3fea81936bd1c5bb2963bd20c1f8753716848de.tar.bz2
opensim-SC_OLD-f3fea81936bd1c5bb2963bd20c1f8753716848de.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f6bfc9b..3fa6bb0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2899,7 +2899,7 @@ namespace OpenSim.Region.Framework.Scenes
2899 } 2899 }
2900 2900
2901 /// <summary> 2901 /// <summary>
2902 /// Update the entire rotation of the group. 2902 /// Update the rotation of just the root prim of a linkset.
2903 /// </summary> 2903 /// </summary>
2904 /// <param name="rot"></param> 2904 /// <param name="rot"></param>
2905 public void UpdateRootRotation(Quaternion rot) 2905 public void UpdateRootRotation(Quaternion rot)
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)