diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs index 3d8e8be..65ae445 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | |||
@@ -45,6 +45,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
45 | private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation(); | 45 | private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation(); |
46 | private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>(); | 46 | private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>(); |
47 | 47 | ||
48 | public OpenSim.Framework.Animation DefaultAnimation | ||
49 | { | ||
50 | get { return m_defaultAnimation; } | ||
51 | } | ||
52 | |||
48 | public OpenSim.Framework.Animation ImplicitDefaultAnimation | 53 | public OpenSim.Framework.Animation ImplicitDefaultAnimation |
49 | { | 54 | { |
50 | get { return m_implicitDefaultAnimation; } | 55 | get { return m_implicitDefaultAnimation; } |
@@ -126,6 +131,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
126 | return false; | 131 | return false; |
127 | } | 132 | } |
128 | 133 | ||
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 | |||
129 | protected bool ResetDefaultAnimation() | 140 | protected bool ResetDefaultAnimation() |
130 | { | 141 | { |
131 | return TrySetDefaultAnimation("STAND", 1, UUID.Zero); | 142 | return TrySetDefaultAnimation("STAND", 1, UUID.Zero); |