aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-18 22:57:09 +0000
committerJustin Clark-Casey (justincc)2013-01-18 22:57:09 +0000
commit74256c0cc47870f6057b64ce117479af79f02ab0 (patch)
tree9bdc9e66f6e668a06a22ee3a2f772855293e4b5a /OpenSim/Region/ScriptEngine/Shared
parentBulletSim: reduce jitter in avatar velocity when walking or flying. (diff)
downloadopensim-SC_OLD-74256c0cc47870f6057b64ce117479af79f02ab0.zip
opensim-SC_OLD-74256c0cc47870f6057b64ce117479af79f02ab0.tar.gz
opensim-SC_OLD-74256c0cc47870f6057b64ce117479af79f02ab0.tar.bz2
opensim-SC_OLD-74256c0cc47870f6057b64ce117479af79f02ab0.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')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d47fd6b..a2f1ff2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3364,7 +3364,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3364 if (animID == UUID.Zero) 3364 if (animID == UUID.Zero)
3365 presence.Animator.RemoveAnimation(anim); 3365 presence.Animator.RemoveAnimation(anim);
3366 else 3366 else
3367 presence.Animator.RemoveAnimation(animID); 3367 presence.Animator.RemoveAnimation(animID, true);
3368 } 3368 }
3369 } 3369 }
3370 } 3370 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 25635ff..5c0ff1c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -986,7 +986,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
986 if (animID == UUID.Zero) 986 if (animID == UUID.Zero)
987 target.Animator.RemoveAnimation(animation); 987 target.Animator.RemoveAnimation(animation);
988 else 988 else
989 target.Animator.RemoveAnimation(animID); 989 target.Animator.RemoveAnimation(animID, true);
990 } 990 }
991 } 991 }
992 } 992 }