Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-13 20:19:10 +00:00
10 changed files with 101 additions and 81 deletions

View File

@@ -3264,13 +3264,6 @@ namespace OpenSim.Region.Framework.Scenes
//}
}
public void SetAvatarOnSitTarget(UUID avatarID)
{
m_sitTargetAvatar = avatarID;
if (ParentGroup != null)
ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
}
public void SetAxisRotation(int axis, int rotate)
{
if (m_parentGroup != null)