OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent empty Anim Packs

avinationmerge
Melanie 2013-01-08 23:01:09 +01:00
parent 0a393b317d
commit ab053df706
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,13 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{ {
int defaultSize = 0; int defaultSize = 0;
if (m_defaultAnimation.AnimID != UUID.Zero) if (m_defaultAnimation.AnimID != UUID.Zero)
{
defaultSize++; defaultSize++;
}
else if (m_animations.Count == 0)
{
defaultSize++;
}
animIDs = new UUID[m_animations.Count + defaultSize]; animIDs = new UUID[m_animations.Count + defaultSize];
sequenceNums = new int[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; sequenceNums[0] = m_defaultAnimation.SequenceNum;
objectIDs[0] = m_defaultAnimation.ObjectID; 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) for (int i = 0; i < m_animations.Count; ++i)
{ {