Solve conflict
parent
61ce884336
commit
1121919b57
|
@ -2910,13 +2910,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
SetText(text);
|
SetText(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StopLookAt()
|
|
||||||
{
|
|
||||||
m_parentGroup.stopLookAt();
|
|
||||||
|
|
||||||
m_parentGroup.ScheduleGroupForTerseUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void StopMoveToTarget()
|
public void StopMoveToTarget()
|
||||||
{
|
{
|
||||||
m_parentGroup.stopMoveToTarget();
|
m_parentGroup.stopMoveToTarget();
|
||||||
|
|
Loading…
Reference in New Issue