diff options
| author | Melanie | 2012-03-22 20:48:31 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:48:31 +0000 |
| commit | 53b4551b58bc948cd6ab1926ce5d240d409266be (patch) | |
| tree | d5bc4ed0edd85807970026c74dc0cfeca9c91bd4 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-53b4551b58bc948cd6ab1926ce5d240d409266be.zip opensim-SC-53b4551b58bc948cd6ab1926ce5d240d409266be.tar.gz opensim-SC-53b4551b58bc948cd6ab1926ce5d240d409266be.tar.bz2 opensim-SC-53b4551b58bc948cd6ab1926ce5d240d409266be.tar.xz | |
Fix merge issue from core
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index bd4c5fc..4d7c40e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -8408,7 +8408,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8408 | LSL_Vector lower; | 8408 | LSL_Vector lower; |
| 8409 | LSL_Vector upper; | 8409 | LSL_Vector upper; |
| 8410 | if (presence.Animator.Animations.DefaultAnimation.AnimID | 8410 | if (presence.Animator.Animations.DefaultAnimation.AnimID |
| 8411 | == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 8411 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) |
| 8412 | { | 8412 | { |
| 8413 | // This is for ground sitting avatars | 8413 | // This is for ground sitting avatars |
| 8414 | float height = presence.Appearance.AvatarHeight / 2.66666667f; | 8414 | float height = presence.Appearance.AvatarHeight / 2.66666667f; |