From f59e272643a92b20e7f7eb97f54a30c8b045725d Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sun, 13 Jun 2010 22:21:05 +0200 Subject: [PATCH] Introduce SOP.UpdateSitters() to update sitting avatars' chat position if needed --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 9 +++++++++ OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index c7d21bba90..6f68029220 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2174,6 +2174,7 @@ namespace OpenSim.Region.Framework.Scenes { m_rootPart.UpdateFlag = 1; lastPhysGroupPos = AbsolutePosition; + UpdateSitters(); } if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f)) @@ -3832,6 +3833,14 @@ 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 e4a36efb76..705e0a3adc 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -4720,5 +4720,13 @@ namespace OpenSim.Region.Framework.Scenes Inventory.UpdateInventoryItem(item); } } + + public void UpdateSitter() + { + if (m_sitTargetAvatar != UUID.Zero) + return; + + // Update sitting avatar chat position + } } }