Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat position if"
This reverts commit f59e272643
.
avinationmerge
parent
5fda89fdb5
commit
f9b4f5f594
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue