Merge branch 'master' into careminster

This commit is contained in:
Melanie
2009-12-22 00:41:56 +00:00
9 changed files with 31 additions and 17 deletions

View File

@@ -1853,7 +1853,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
public void rotLookAt(Quaternion target, float strength, float damping)
{
SceneObjectPart rootpart = m_rootPart;
@@ -1880,6 +1880,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
public void stopLookAt()
{
SceneObjectPart rootpart = m_rootPart;