Solve conflict

This commit is contained in:
Melanie
2010-01-03 22:02:36 +00:00
parent 61ce884336
commit 1121919b57

View File

@@ -2910,13 +2910,6 @@ namespace OpenSim.Region.Framework.Scenes
SetText(text);
}
public void StopLookAt()
{
m_parentGroup.stopLookAt();
m_parentGroup.ScheduleGroupForTerseUpdate();
}
public void StopMoveToTarget()
{
m_parentGroup.stopMoveToTarget();