From fc6115f77755734d5a60b9eeebef25b98696f4e4 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Sat, 19 Jan 2013 02:29:02 +0000 Subject: [PATCH] Check the existing ScenePresence.ParentPart to make sure we're not trying to sit on a prim we're already sat upon, rather than looking up the part from scratch. An adaptation of commit 055b8a2 Having both ParentID and ParentPart references now is redundant. ParentID should probably be eliminated. --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c295305a7d..a90872e541 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1954,8 +1954,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();