aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-18 22:57:09 +0000
committerJustin Clark-Casey (justincc)2013-01-25 23:54:53 +0000
commitaf5a3f2d7392ce6f86ef210c401956ca92cdb8e2 (patch)
tree973e46d4dd45814ac7737617b9bc94e5e1aece7f /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
parentCheck the existing ScenePresence.ParentPart to make sure we're not trying to ... (diff)
downloadopensim-SC_OLD-af5a3f2d7392ce6f86ef210c401956ca92cdb8e2.zip
opensim-SC_OLD-af5a3f2d7392ce6f86ef210c401956ca92cdb8e2.tar.gz
opensim-SC_OLD-af5a3f2d7392ce6f86ef210c401956ca92cdb8e2.tar.bz2
opensim-SC_OLD-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/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 828288d..dcc85c4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -974,7 +974,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
974 if (animID == UUID.Zero) 974 if (animID == UUID.Zero)
975 target.Animator.RemoveAnimation(animation); 975 target.Animator.RemoveAnimation(animation);
976 else 976 else
977 target.Animator.RemoveAnimation(animID); 977 target.Animator.RemoveAnimation(animID, true);
978 } 978 }
979 } 979 }
980 } 980 }