diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs index 65ae445..ad421ee 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | |||
@@ -41,7 +41,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
41 | { | 41 | { |
42 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | private OpenSim.Framework.Animation m_implicitDefaultAnimation = new OpenSim.Framework.Animation(); | ||
45 | private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation(); | 44 | private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation(); |
46 | private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>(); | 45 | private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>(); |
47 | 46 | ||
@@ -50,11 +49,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
50 | get { return m_defaultAnimation; } | 49 | get { return m_defaultAnimation; } |
51 | } | 50 | } |
52 | 51 | ||
53 | public OpenSim.Framework.Animation ImplicitDefaultAnimation | ||
54 | { | ||
55 | get { return m_implicitDefaultAnimation; } | ||
56 | } | ||
57 | |||
58 | public AnimationSet() | 52 | public AnimationSet() |
59 | { | 53 | { |
60 | ResetDefaultAnimation(); | 54 | ResetDefaultAnimation(); |
@@ -125,18 +119,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
125 | if (m_defaultAnimation.AnimID != animID) | 119 | if (m_defaultAnimation.AnimID != animID) |
126 | { | 120 | { |
127 | m_defaultAnimation = new OpenSim.Framework.Animation(animID, sequenceNum, objectID); | 121 | m_defaultAnimation = new OpenSim.Framework.Animation(animID, sequenceNum, objectID); |
128 | m_implicitDefaultAnimation = m_defaultAnimation; | ||
129 | return true; | 122 | return true; |
130 | } | 123 | } |
131 | return false; | 124 | return false; |
132 | } | 125 | } |
133 | 126 | ||
134 | // Called from serialization only | ||
135 | public void SetImplicitDefaultAnimation(UUID animID, int sequenceNum, UUID objectID) | ||
136 | { | ||
137 | m_implicitDefaultAnimation = new OpenSim.Framework.Animation(animID, sequenceNum, objectID); | ||
138 | } | ||
139 | |||
140 | protected bool ResetDefaultAnimation() | 127 | protected bool ResetDefaultAnimation() |
141 | { | 128 | { |
142 | return TrySetDefaultAnimation("STAND", 1, UUID.Zero); | 129 | return TrySetDefaultAnimation("STAND", 1, UUID.Zero); |