3 files changed, 6 insertions, 6 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
 //                "[ANIMATION SET]: Setting default animation {0}, sequence number {1}, object id {2}",
 //                anim, sequenceNum, objectID);
 
-            if (AvatarAnimations.AnimsUUID.ContainsKey(anim))
+            if (DefaultAvatarAnimations.AnimsUUID.ContainsKey(anim))
             {
-                return SetDefaultAnimation(AvatarAnimations.AnimsUUID[anim], sequenceNum, objectID);
+                return SetDefaultAnimation(DefaultAvatarAnimations.AnimsUUID[anim], sequenceNum, objectID);
             }
             return false;
         }
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
index ec928f4..c2b0468 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
@@ -33,7 +33,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Scenes.Animation
 {
-    public class AvatarAnimations
+    public class DefaultAvatarAnimations
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         public static Dictionary<UUID, string> AnimsNames = new Dictionary<UUID, string>();
         public static Dictionary<UUID, string> AnimStateNames = new Dictionary<UUID, string>();
 
-        static AvatarAnimations()
+        static DefaultAvatarAnimations()
         {
             LoadAnimations(DefaultAnimationsPath);
         }
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
 
             // XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations
             // are referenced with lower case names!
-            UUID animID = AvatarAnimations.GetDefaultAnimation(name.ToUpper());
+            UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name.ToUpper());
             if (animID == UUID.Zero)
                 return;
 
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             // XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations
             // are referenced with lower case names!
-            UUID animID = AvatarAnimations.GetDefaultAnimation(name);
+            UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name);
             if (animID == UUID.Zero)
                 return;