2 files changed, 1 insertions, 14 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4b3dcbd..0fe9842 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2470,18 +2470,6 @@ namespace OpenSim.Region.Framework.Scenes
                 return new Vector3(0, 0, 0);
 
             return ParentGroup.GetGeometricCenter();
-
-            /*
-                        PhysicsActor pa = PhysActor;
-
-                        if (pa != null)
-                        {
-                            Vector3 vtmp = pa.CenterOfMass;
-                            return vtmp;
-                        }
-                        else
-                            return new Vector3(0, 0, 0);
-             */
         }
 
         public float GetMass()
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9d18352..f024f52 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2197,8 +2197,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (ParentID != 0)
             {
-                var targetPart = m_scene.GetSceneObjectPart(targetID);
-                if (targetPart != null && targetPart.LocalId == ParentID)
+                if (ParentPart.UUID == targetID)
                     return; // already sitting here, ignore
 
                 StandUp();