Fix merge

This commit is contained in:
Melanie
2012-01-14 05:39:56 +01:00
parent 43128c9016
commit 4cbf8d728e
2 changed files with 1 additions and 61 deletions

View File

@@ -2746,11 +2746,6 @@ namespace OpenSim.Region.Framework.Scenes
}
public void RotLookAt(Quaternion target, float strength, float damping)
{
m_parentGroup.rotLookAt(target, strength, damping); // This calls method in SceneObjectGroup.
}
public void rotLookAt(Quaternion target, float strength, float damping)
{
if (ParentGroup.IsAttachment)
{