diff options
| author | Melanie | 2012-10-26 21:47:41 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-26 21:47:41 +0100 |
| commit | f3f794a12292e2abfdaecaa68b87663f27619277 (patch) | |
| tree | 17db09a28875bd0da13112c9601ef140e5e96ebd /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Separate LSL's notion of the default anim from the actually playing anims. (diff) | |
| download | opensim-SC_OLD-f3f794a12292e2abfdaecaa68b87663f27619277.zip opensim-SC_OLD-f3f794a12292e2abfdaecaa68b87663f27619277.tar.gz opensim-SC_OLD-f3f794a12292e2abfdaecaa68b87663f27619277.tar.bz2 opensim-SC_OLD-f3f794a12292e2abfdaecaa68b87663f27619277.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 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 8d8df1d..9011966 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6122,7 +6122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6122 | flags |= ScriptBaseClass.AGENT_SITTING; | 6122 | flags |= ScriptBaseClass.AGENT_SITTING; |
| 6123 | } | 6123 | } |
| 6124 | 6124 | ||
| 6125 | if (agent.Animator.Animations.DefaultAnimation.AnimID | 6125 | if (agent.Animator.Animations.ImplicitDefaultAnimation.AnimID |
| 6126 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 6126 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) |
| 6127 | { | 6127 | { |
| 6128 | flags |= ScriptBaseClass.AGENT_SITTING; | 6128 | flags |= ScriptBaseClass.AGENT_SITTING; |
| @@ -8584,7 +8584,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8584 | // and standing avatar since server 1.36 | 8584 | // and standing avatar since server 1.36 |
| 8585 | LSL_Vector lower; | 8585 | LSL_Vector lower; |
| 8586 | LSL_Vector upper; | 8586 | LSL_Vector upper; |
| 8587 | if (presence.Animator.Animations.DefaultAnimation.AnimID | 8587 | if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID |
| 8588 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 8588 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) |
| 8589 | { | 8589 | { |
| 8590 | // This is for ground sitting avatars | 8590 | // This is for ground sitting avatars |