From 88c4c7283f7b867aa27b344061c7c9be965db9aa Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 4 May 2012 20:02:14 +0200
Subject: Revert "*TO TEST/REVIEW* added current default animation in
 animationSet.cs to/fromArray in array element 0. This may cause
 compatibilities issues, but think this information is needed for proper
 crossings. OSG  regions did survived tps in/out with this. ALso added
 velocity in crossings cases, for now detected by Teleport flag equal to
 Default (0);"

This reverts commit 12c9916193bbb87aaa95407f798c241cbe5e23cb.
---
 OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Animation')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index da1b9e0..33041e9 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -168,11 +168,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
         public OpenSim.Framework.Animation[] ToArray()
         {
-            OpenSim.Framework.Animation[] theArray = new OpenSim.Framework.Animation[m_animations.Count + 1];
+            OpenSim.Framework.Animation[] theArray = new OpenSim.Framework.Animation[m_animations.Count];
             uint i = 0;
             try
             {
-                theArray[i++] = m_defaultAnimation;
                 foreach (OpenSim.Framework.Animation anim in m_animations)
                     theArray[i++] = anim;
             }
@@ -185,14 +184,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
         public void FromArray(OpenSim.Framework.Animation[] theArray)
         {
-//            foreach (OpenSim.Framework.Animation anim in theArray)
-//                m_animations.Add(anim);
-            if (theArray.Length > 0)
-            {
-                m_defaultAnimation = theArray[0];
-                for (int i = 1; i < theArray.Length; i++)
-                    m_animations.Add(theArray[i]);
-            }
+            foreach (OpenSim.Framework.Animation anim in theArray)
+                m_animations.Add(anim);
         }
     }
 }
-- 
cgit v1.1