Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-11 02:01:23 +00:00
6 changed files with 196 additions and 21 deletions

View File

@@ -4089,6 +4089,23 @@ namespace OpenSim.Region.Framework.Scenes
{
m_parentGroup.unregisterTargetWaypoint(handle);
}
}
public int registerRotTargetWaypoint(Quaternion target, float tolerance)
{
if (m_parentGroup != null)
{
return m_parentGroup.registerRotTargetWaypoint(target, tolerance);
}
return 0;
}
public void unregisterRotTargetWaypoint(int handle)
{
if (m_parentGroup != null)
{
m_parentGroup.unregisterRotTargetWaypoint(handle);
}
}
public void SetCameraAtOffset(Vector3 v)