aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2010-06-13 22:21:05 +0200
committerMelanie Thielker2010-06-13 22:21:05 +0200
commitf59e272643a92b20e7f7eb97f54a30c8b045725d (patch)
treec9df5dba2d93c27acf8c38e548e175fbdfac087f /OpenSim/Region/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-f59e272643a92b20e7f7eb97f54a30c8b045725d.zip
opensim-SC_OLD-f59e272643a92b20e7f7eb97f54a30c8b045725d.tar.gz
opensim-SC_OLD-f59e272643a92b20e7f7eb97f54a30c8b045725d.tar.bz2
opensim-SC_OLD-f59e272643a92b20e7f7eb97f54a30c8b045725d.tar.xz
Introduce SOP.UpdateSitters() to update sitting avatars' chat position if
needed
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs8
2 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c7d21bb..6f68029 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2174,6 +2174,7 @@ namespace OpenSim.Region.Framework.Scenes
2174 { 2174 {
2175 m_rootPart.UpdateFlag = 1; 2175 m_rootPart.UpdateFlag = 1;
2176 lastPhysGroupPos = AbsolutePosition; 2176 lastPhysGroupPos = AbsolutePosition;
2177 UpdateSitters();
2177 } 2178 }
2178 2179
2179 if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f)) 2180 if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f))
@@ -3832,6 +3833,14 @@ namespace OpenSim.Region.Framework.Scenes
3832 } 3833 }
3833 } 3834 }
3834 3835
3836 private void UpdateSitters()
3837 {
3838 foreach (SceneObjectPart part in Children.Values)
3839 {
3840 part.UpdateSitter();
3841 }
3842 }
3843
3835 public override string ToString() 3844 public override string ToString()
3836 { 3845 {
3837 return String.Format("{0} {1} ({2})", Name, UUID, AbsolutePosition); 3846 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 e4a36ef..705e0a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4720,5 +4720,13 @@ namespace OpenSim.Region.Framework.Scenes
4720 Inventory.UpdateInventoryItem(item); 4720 Inventory.UpdateInventoryItem(item);
4721 } 4721 }
4722 } 4722 }
4723
4724 public void UpdateSitter()
4725 {
4726 if (m_sitTargetAvatar != UUID.Zero)
4727 return;
4728
4729 // Update sitting avatar chat position
4730 }
4723 } 4731 }
4724} 4732}