ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

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);"

Browse Source 
This reverts commit 12c9916193.
This commit is contained in:
Melanie
2012-05-04 20:02:14 +02:00
parent 12c9916193
commit 88c4c7283f
2 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
View File

@@ -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);
}
}
}