aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-22 00:10:41 +0000
committerJustin Clark-Casey (justincc)2012-03-22 00:10:41 +0000
commit9949ac2f9f448faaa873b98451c6025d687358a2 (patch)
treeb08cef27f386fd547bfe6cf7cf43b0d789f098dd /OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-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/AnimationSet.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index 240a424..33041e9 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -138,9 +138,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
138// "[ANIMATION SET]: Setting default animation {0}, sequence number {1}, object id {2}", 138// "[ANIMATION SET]: Setting default animation {0}, sequence number {1}, object id {2}",
139// anim, sequenceNum, objectID); 139// anim, sequenceNum, objectID);
140 140
141 if (AvatarAnimations.AnimsUUID.ContainsKey(anim)) 141 if (DefaultAvatarAnimations.AnimsUUID.ContainsKey(anim))
142 { 142 {
143 return SetDefaultAnimation(AvatarAnimations.AnimsUUID[anim], sequenceNum, objectID); 143 return SetDefaultAnimation(DefaultAvatarAnimations.AnimsUUID[anim], sequenceNum, objectID);
144 } 144 }
145 return false; 145 return false;
146 } 146 }