Merge branch 'master' into cooptermination

This commit is contained in:
Justin Clark-Casey (justincc)
2013-01-24 00:03:44 +00:00
65 changed files with 1931 additions and 12753 deletions

View File

@@ -986,7 +986,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (animID == UUID.Zero)
target.Animator.RemoveAnimation(animation);
else
target.Animator.RemoveAnimation(animID);
target.Animator.RemoveAnimation(animID, true);
}
}
}