diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 1 insertions, 2 deletions
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 | |||
2197 | 2197 | ||
2198 | if (ParentID != 0) | 2198 | if (ParentID != 0) |
2199 | { | 2199 | { |
2200 | var targetPart = m_scene.GetSceneObjectPart(targetID); | 2200 | if (ParentPart.UUID == targetID) |
2201 | if (targetPart != null && targetPart.LocalId == ParentID) | ||
2202 | return; // already sitting here, ignore | 2201 | return; // already sitting here, ignore |
2203 | 2202 | ||
2204 | StandUp(); | 2203 | StandUp(); |