diff options
author | UbitUmarov | 2012-03-23 03:41:48 +0000 |
---|---|---|
committer | UbitUmarov | 2012-03-23 03:41:48 +0000 |
commit | 4db05a98c2c1678b612e0a3d2f95c24e34ac5f13 (patch) | |
tree | 3929bd993c504a3de7697f449e36535aeeddf737 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.zip opensim-SC_OLD-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.gz opensim-SC_OLD-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.bz2 opensim-SC_OLD-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index df4c7f8..4d7c40e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4764,7 +4764,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4764 | 4764 | ||
4765 | if (m_host.RegionHandle == presence.RegionHandle) | 4765 | if (m_host.RegionHandle == presence.RegionHandle) |
4766 | { | 4766 | { |
4767 | Dictionary<UUID, string> animationstateNames = AnimationSet.Animations.AnimStateNames; | 4767 | Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames; |
4768 | 4768 | ||
4769 | if (presence != null) | 4769 | if (presence != null) |
4770 | { | 4770 | { |
@@ -6064,7 +6064,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6064 | } | 6064 | } |
6065 | 6065 | ||
6066 | if (agent.Animator.Animations.DefaultAnimation.AnimID | 6066 | if (agent.Animator.Animations.DefaultAnimation.AnimID |
6067 | == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 6067 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) |
6068 | { | 6068 | { |
6069 | flags |= ScriptBaseClass.AGENT_SITTING; | 6069 | flags |= ScriptBaseClass.AGENT_SITTING; |
6070 | } | 6070 | } |
@@ -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; |