aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-01-09 00:20:24 +0000
committerMelanie2013-01-09 00:20:24 +0000
commitf16c4a254c263a7fd75799fe79da6b3d0a1c80a2 (patch)
treeb79fb086a8866432e4c9f840134f427943a7a5f0
parentRevert "Fix sequence id fr default anim" (diff)
downloadopensim-SC_OLD-f16c4a254c263a7fd75799fe79da6b3d0a1c80a2.zip
opensim-SC_OLD-f16c4a254c263a7fd75799fe79da6b3d0a1c80a2.tar.gz
opensim-SC_OLD-f16c4a254c263a7fd75799fe79da6b3d0a1c80a2.tar.bz2
opensim-SC_OLD-f16c4a254c263a7fd75799fe79da6b3d0a1c80a2.tar.xz
Revert "Prevent empty Anim Packs"
This reverts commit 5561333668f61f043cdfc0733a4eb50a1bcfb14e.
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs12
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index d2fc7f1..65ae445 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -164,13 +164,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
164 { 164 {
165 int defaultSize = 0; 165 int defaultSize = 0;
166 if (m_defaultAnimation.AnimID != UUID.Zero) 166 if (m_defaultAnimation.AnimID != UUID.Zero)
167 {
168 defaultSize++;
169 }
170 else if (m_animations.Count == 0)
171 {
172 defaultSize++; 167 defaultSize++;
173 }
174 168
175 animIDs = new UUID[m_animations.Count + defaultSize]; 169 animIDs = new UUID[m_animations.Count + defaultSize];
176 sequenceNums = new int[m_animations.Count + defaultSize]; 170 sequenceNums = new int[m_animations.Count + defaultSize];
@@ -182,12 +176,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation
182 sequenceNums[0] = m_defaultAnimation.SequenceNum; 176 sequenceNums[0] = m_defaultAnimation.SequenceNum;
183 objectIDs[0] = m_defaultAnimation.ObjectID; 177 objectIDs[0] = m_defaultAnimation.ObjectID;
184 } 178 }
185 else if (m_animations.Count == 0)
186 {
187 animIDs[0] = m_implicitDefaultAnimation.AnimID;
188 sequenceNums[0] = m_defaultAnimation.SequenceNum;
189 objectIDs[0] = m_implicitDefaultAnimation.ObjectID;
190 }
191 179
192 for (int i = 0; i < m_animations.Count; ++i) 180 for (int i = 0; i < m_animations.Count; ++i)
193 { 181 {