diff options
author | Justin Clark-Casey (justincc) | 2013-01-18 22:57:09 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-25 23:54:53 +0000 |
commit | af5a3f2d7392ce6f86ef210c401956ca92cdb8e2 (patch) | |
tree | 973e46d4dd45814ac7737617b9bc94e5e1aece7f /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Check the existing ScenePresence.ParentPart to make sure we're not trying to ... (diff) | |
download | opensim-SC-af5a3f2d7392ce6f86ef210c401956ca92cdb8e2.zip opensim-SC-af5a3f2d7392ce6f86ef210c401956ca92cdb8e2.tar.gz opensim-SC-af5a3f2d7392ce6f86ef210c401956ca92cdb8e2.tar.bz2 opensim-SC-af5a3f2d7392ce6f86ef210c401956ca92cdb8e2.tar.xz |
Restore previous client AO behaviour by not allowing them to remove the default animation but continue to allow scripts to do so.
This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327
and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483
Animations may still exhibit different behaviour if both scripts and clients are adjusting animations.
A change in the behaviour of client AO to not remove all animations may be a better long term approach.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index db2e95e..a90872e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2259,7 +2259,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2259 | 2259 | ||
2260 | public void HandleStopAnim(IClientAPI remoteClient, UUID animID) | 2260 | public void HandleStopAnim(IClientAPI remoteClient, UUID animID) |
2261 | { | 2261 | { |
2262 | Animator.RemoveAnimation(animID); | 2262 | Animator.RemoveAnimation(animID, false); |
2263 | } | 2263 | } |
2264 | 2264 | ||
2265 | /// <summary> | 2265 | /// <summary> |