aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2010-06-14 00:05:01 +0200
committerMelanie Thielker2010-06-14 00:05:01 +0200
commitf9b4f5f594caf609d255c585c4224f0455403908 (patch)
tree909cced3d943767429b5785faae4df439427edd7 /OpenSim
parentRevert "D.U.H." (diff)
downloadopensim-SC-f9b4f5f594caf609d255c585c4224f0455403908.zip
opensim-SC-f9b4f5f594caf609d255c585c4224f0455403908.tar.gz
opensim-SC-f9b4f5f594caf609d255c585c4224f0455403908.tar.bz2
opensim-SC-f9b4f5f594caf609d255c585c4224f0455403908.tar.xz
Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat position if"
This reverts commit f59e272643a92b20e7f7eb97f54a30c8b045725d.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs14
2 files changed, 0 insertions, 23 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6f68029..c7d21bb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2174,7 +2174,6 @@ 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();
2178 } 2177 }
2179 2178
2180 if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f)) 2179 if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f))
@@ -3833,14 +3832,6 @@ namespace OpenSim.Region.Framework.Scenes
3833 } 3832 }
3834 } 3833 }
3835 3834
3836 private void UpdateSitters()
3837 {
3838 foreach (SceneObjectPart part in Children.Values)
3839 {
3840 part.UpdateSitter();
3841 }
3842 }
3843
3844 public override string ToString() 3835 public override string ToString()
3845 { 3836 {
3846 return String.Format("{0} {1} ({2})", Name, UUID, AbsolutePosition); 3837 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 be2bbc5..b80a557 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4720,19 +4720,5 @@ 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 ScenePresence p = m_parentGroup.Scene.GetScenePresence(m_sitTargetAvatar);
4730 if (p == null)
4731 return;
4732
4733 // Update sitting avatar chat position
4734
4735 p.AbsolutePosition = AbsolutePosition;
4736 }
4737 } 4723 }
4738} 4724}