OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat position if" 

This reverts commit f59e272643.
avinationmerge
Melanie Thielker 2010-06-14 00:05:01 +02:00
parent 5fda89fdb5
commit f9b4f5f594
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -2174,7 +2174,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
m_rootPart.UpdateFlag = 1; m_rootPart.UpdateFlag = 1;
lastPhysGroupPos = AbsolutePosition; lastPhysGroupPos = AbsolutePosition;
UpdateSitters();
} }
if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f)) 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() public override string ToString()
{ {
return String.Format("{0} {1} ({2})", Name, UUID, AbsolutePosition); return String.Format("{0} {1} ({2})", Name, UUID, AbsolutePosition);

14
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -4720,19 +4720,5 @@ namespace OpenSim.Region.Framework.Scenes
Inventory.UpdateInventoryItem(item); 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;
}
} }
} }