aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation
diff options
context:
space:
mode:
authorMelanie2012-05-04 20:02:14 +0200
committerMelanie2012-05-04 20:02:14 +0200
commit88c4c7283f7b867aa27b344061c7c9be965db9aa (patch)
treeda360e49c23c33e40c219eddd1af53c14247a3e3 /OpenSim/Region/Framework/Scenes/Animation
parent*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromAr... (diff)
downloadopensim-SC_OLD-88c4c7283f7b867aa27b344061c7c9be965db9aa.zip
opensim-SC_OLD-88c4c7283f7b867aa27b344061c7c9be965db9aa.tar.gz
opensim-SC_OLD-88c4c7283f7b867aa27b344061c7c9be965db9aa.tar.bz2
opensim-SC_OLD-88c4c7283f7b867aa27b344061c7c9be965db9aa.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs13
1 files changed, 3 insertions, 10 deletions
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
168 168
169 public OpenSim.Framework.Animation[] ToArray() 169 public OpenSim.Framework.Animation[] ToArray()
170 { 170 {
171 OpenSim.Framework.Animation[] theArray = new OpenSim.Framework.Animation[m_animations.Count + 1]; 171 OpenSim.Framework.Animation[] theArray = new OpenSim.Framework.Animation[m_animations.Count];
172 uint i = 0; 172 uint i = 0;
173 try 173 try
174 { 174 {
175 theArray[i++] = m_defaultAnimation;
176 foreach (OpenSim.Framework.Animation anim in m_animations) 175 foreach (OpenSim.Framework.Animation anim in m_animations)
177 theArray[i++] = anim; 176 theArray[i++] = anim;
178 } 177 }
@@ -185,14 +184,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
185 184
186 public void FromArray(OpenSim.Framework.Animation[] theArray) 185 public void FromArray(OpenSim.Framework.Animation[] theArray)
187 { 186 {
188// foreach (OpenSim.Framework.Animation anim in theArray) 187 foreach (OpenSim.Framework.Animation anim in theArray)
189// m_animations.Add(anim); 188 m_animations.Add(anim);
190 if (theArray.Length > 0)
191 {
192 m_defaultAnimation = theArray[0];
193 for (int i = 1; i < theArray.Length; i++)
194 m_animations.Add(theArray[i]);
195 }
196 } 189 }
197 } 190 }
198} 191}