From f9b4f5f594caf609d255c585c4224f0455403908 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Mon, 14 Jun 2010 00:05:01 +0200
Subject: [PATCH] Revert "Introduce SOP.UpdateSitters() to update sitting
 avatars' chat position if"

This reverts commit f59e272643a92b20e7f7eb97f54a30c8b045725d.
---
 .../Region/Framework/Scenes/SceneObjectGroup.cs    |  9 ---------
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 --------------
 2 files changed, 23 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6f68029220..c7d21bba90 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2174,7 +2174,6 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_rootPart.UpdateFlag = 1;
                     lastPhysGroupPos = AbsolutePosition;
-                    UpdateSitters();
                 }
 
                 if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f))
@@ -3833,14 +3832,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
         
-        private void UpdateSitters()
-        {
-            foreach (SceneObjectPart part in Children.Values)
-            {
-                part.UpdateSitter();
-            }
-        }
-        
         public override string ToString()
         {
             return String.Format("{0} {1} ({2})", Name, UUID, AbsolutePosition);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index be2bbc590c..b80a557d34 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4720,19 +4720,5 @@ namespace OpenSim.Region.Framework.Scenes
                 Inventory.UpdateInventoryItem(item);
             }
         }
-
-        public void UpdateSitter()
-        {
-            if (m_sitTargetAvatar != UUID.Zero)
-                return;
-
-            ScenePresence p = m_parentGroup.Scene.GetScenePresence(m_sitTargetAvatar);
-            if (p == null)
-                return;
-
-            // Update sitting avatar chat position
-
-            p.AbsolutePosition = AbsolutePosition;
-        }
     }
 }