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/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-9949ac2f9f448faaa873b98451c6025d687358a2.zip opensim-SC-9949ac2f9f448faaa873b98451c6025d687358a2.tar.gz opensim-SC-9949ac2f9f448faaa873b98451c6025d687358a2.tar.bz2 opensim-SC-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/Framework/Scenes/Animation/ScenePresenceAnimator.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 9038ebc..cded9be 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
99 | 99 | ||
100 | // XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations | 100 | // XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations |
101 | // are referenced with lower case names! | 101 | // are referenced with lower case names! |
102 | UUID animID = AvatarAnimations.GetDefaultAnimation(name.ToUpper()); | 102 | UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name.ToUpper()); |
103 | if (animID == UUID.Zero) | 103 | if (animID == UUID.Zero) |
104 | return; | 104 | return; |
105 | 105 | ||
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
125 | 125 | ||
126 | // XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations | 126 | // XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations |
127 | // are referenced with lower case names! | 127 | // are referenced with lower case names! |
128 | UUID animID = AvatarAnimations.GetDefaultAnimation(name); | 128 | UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name); |
129 | if (animID == UUID.Zero) | 129 | if (animID == UUID.Zero) |
130 | return; | 130 | return; |
131 | 131 | ||