1 files changed, 12 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index 65ae445..d2fc7f1 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -164,7 +164,13 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             {
                 int defaultSize = 0;
                 if (m_defaultAnimation.AnimID != UUID.Zero)
+                {
+                    defaultSize++;
+                }
+                else if (m_animations.Count == 0)
+                {
                     defaultSize++;
+                }
 
                 animIDs = new UUID[m_animations.Count + defaultSize];
                 sequenceNums = new int[m_animations.Count + defaultSize];
@@ -176,6 +182,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     sequenceNums[0] = m_defaultAnimation.SequenceNum;
                     objectIDs[0] = m_defaultAnimation.ObjectID;
                 }
+                else if (m_animations.Count == 0)
+                {
+                    animIDs[0] = m_implicitDefaultAnimation.AnimID;
+                    sequenceNums[0] = m_defaultAnimation.SequenceNum;
+                    objectIDs[0] = m_implicitDefaultAnimation.ObjectID;
+                }
 
                 for (int i = 0; i < m_animations.Count; ++i)
                 {