diff options
author | Justin Clark-Casey (justincc) | 2012-03-22 00:10:41 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-22 00:10:41 +0000 |
commit | 9949ac2f9f448faaa873b98451c6025d687358a2 (patch) | |
tree | b08cef27f386fd547bfe6cf7cf43b0d789f098dd /OpenSim/Region/ScriptEngine | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-9949ac2f9f448faaa873b98451c6025d687358a2.zip opensim-SC_OLD-9949ac2f9f448faaa873b98451c6025d687358a2.tar.gz opensim-SC_OLD-9949ac2f9f448faaa873b98451c6025d687358a2.tar.bz2 opensim-SC_OLD-9949ac2f9f448faaa873b98451c6025d687358a2.tar.xz |
refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity since non-default animations are handled completely separately from this class
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-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 27f7c03..d7a629b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4314,7 +4314,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4314 | 4314 | ||
4315 | if (m_host.RegionHandle == presence.RegionHandle) | 4315 | if (m_host.RegionHandle == presence.RegionHandle) |
4316 | { | 4316 | { |
4317 | Dictionary<UUID, string> animationstateNames = AvatarAnimations.AnimStateNames; | 4317 | Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames; |
4318 | 4318 | ||
4319 | if (presence != null) | 4319 | if (presence != null) |
4320 | { | 4320 | { |
@@ -5600,7 +5600,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5600 | } | 5600 | } |
5601 | 5601 | ||
5602 | if (agent.Animator.Animations.DefaultAnimation.AnimID | 5602 | if (agent.Animator.Animations.DefaultAnimation.AnimID |
5603 | == AvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 5603 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) |
5604 | { | 5604 | { |
5605 | flags |= ScriptBaseClass.AGENT_SITTING; | 5605 | flags |= ScriptBaseClass.AGENT_SITTING; |
5606 | } | 5606 | } |
@@ -7714,7 +7714,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7714 | LSL_Vector lower; | 7714 | LSL_Vector lower; |
7715 | LSL_Vector upper; | 7715 | LSL_Vector upper; |
7716 | if (presence.Animator.Animations.DefaultAnimation.AnimID | 7716 | if (presence.Animator.Animations.DefaultAnimation.AnimID |
7717 | == AvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 7717 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) |
7718 | { | 7718 | { |
7719 | // This is for ground sitting avatars | 7719 | // This is for ground sitting avatars |
7720 | float height = presence.Appearance.AvatarHeight / 2.66666667f; | 7720 | float height = presence.Appearance.AvatarHeight / 2.66666667f; |