From e2823bfefe6bebff38b68aec456fc6fb824895a7 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 14 Jan 2013 22:24:24 -0800
Subject: move resit fix to ScenePresence.cs and allow for requesting sit on
 objects other than the object currently sat on

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0219540..6979c33 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1954,6 +1954,10 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (ParentID != 0)
             {
+                var targetPart = m_scene.GetSceneObjectPart(targetID);
+                if (targetPart != null && targetPart.LocalId == ParentID)
+                    return; // already sitting here, ignore
+
                 StandUp();
             }
 
-- 
cgit v1.1