diff options
author | Melanie | 2013-01-09 00:11:08 +0100 |
---|---|---|
committer | Melanie | 2013-01-09 00:11:08 +0100 |
commit | 92db4ef0686d0cce11cf23de926352ace0104bb7 (patch) | |
tree | fb0c505ec5f3171b4636f447b0e1b1182d366d13 /OpenSim/Region/Framework/Scenes/Animation | |
parent | Revert "Fix sequence id fr default anim" (diff) | |
download | opensim-SC-92db4ef0686d0cce11cf23de926352ace0104bb7.zip opensim-SC-92db4ef0686d0cce11cf23de926352ace0104bb7.tar.gz opensim-SC-92db4ef0686d0cce11cf23de926352ace0104bb7.tar.bz2 opensim-SC-92db4ef0686d0cce11cf23de926352ace0104bb7.tar.xz |
Revert "Prevent empty Anim Packs"
This reverts commit ab053df706055b0aa8fe2d10f89488be97d36841.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 12 |
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 | { |