aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-04-05 02:16:14 +0100
committerJustin Clark-Casey (justincc)2014-04-05 02:16:14 +0100
commitcacbb5c165a8e97082e9599def824bc0185f4c38 (patch)
treeccf45d57d96d4fb980ef34550ebec40653aa94fb /OpenSim/Region/Framework
parentRevert "Don't re-retrieve sit part in SP.HandleAgentSit() when we already hav... (diff)
downloadopensim-SC_OLD-cacbb5c165a8e97082e9599def824bc0185f4c38.zip
opensim-SC_OLD-cacbb5c165a8e97082e9599def824bc0185f4c38.tar.gz
opensim-SC_OLD-cacbb5c165a8e97082e9599def824bc0185f4c38.tar.bz2
opensim-SC_OLD-cacbb5c165a8e97082e9599def824bc0185f4c38.tar.xz
Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it (this time with the right code change)
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6e613a7..fdc1f32 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2866,7 +2866,6 @@ namespace OpenSim.Region.Framework.Scenes
2866 return; 2866 return;
2867 } 2867 }
2868 2868
2869
2870 if (part.SitTargetAvatar == UUID) 2869 if (part.SitTargetAvatar == UUID)
2871 { 2870 {
2872 Vector3 sitTargetPos = part.SitTargetPosition; 2871 Vector3 sitTargetPos = part.SitTargetPosition;
@@ -2935,7 +2934,7 @@ namespace OpenSim.Region.Framework.Scenes
2935// Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId); 2934// Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId);
2936 } 2935 }
2937 2936
2938 ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID); 2937 ParentPart = part;
2939 ParentID = m_requestedSitTargetID; 2938 ParentID = m_requestedSitTargetID;
2940 m_AngularVelocity = Vector3.Zero; 2939 m_AngularVelocity = Vector3.Zero;
2941 Velocity = Vector3.Zero; 2940 Velocity = Vector3.Zero;