diff options
author | Justin Clark-Casey (justincc) | 2012-10-26 23:10:52 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-26 23:10:52 +0100 |
commit | cc204497e08c79f47a8cdd642ca14090f8718e07 (patch) | |
tree | a1d8c01e8071242c36c9f2aef395918703feff89 /OpenSim/Region/Framework/Scenes | |
parent | Fix "save iar" hanging permanently if the asset request phase times out. (diff) | |
parent | Separate LSL's notion of the default anim from the actually playing anims. (diff) | |
download | opensim-SC-cc204497e08c79f47a8cdd642ca14090f8718e07.zip opensim-SC-cc204497e08c79f47a8cdd642ca14090f8718e07.tar.gz opensim-SC-cc204497e08c79f47a8cdd642ca14090f8718e07.tar.bz2 opensim-SC-cc204497e08c79f47a8cdd642ca14090f8718e07.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs index 9ed4f47..3d8e8be 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | |||
@@ -41,12 +41,13 @@ 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(); | ||
44 | private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation(); | 45 | private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation(); |
45 | 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>(); |
46 | 47 | ||
47 | public OpenSim.Framework.Animation DefaultAnimation | 48 | public OpenSim.Framework.Animation ImplicitDefaultAnimation |
48 | { | 49 | { |
49 | get { return m_defaultAnimation; } | 50 | get { return m_implicitDefaultAnimation; } |
50 | } | 51 | } |
51 | 52 | ||
52 | public AnimationSet() | 53 | public AnimationSet() |
@@ -87,7 +88,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
87 | { | 88 | { |
88 | if (m_defaultAnimation.AnimID == animID) | 89 | if (m_defaultAnimation.AnimID == animID) |
89 | { | 90 | { |
90 | m_defaultAnimation = new OpenSim.Framework.Animation(animID, 1, UUID.Zero); | 91 | m_defaultAnimation = new OpenSim.Framework.Animation(UUID.Zero, 1, UUID.Zero); |
91 | } | 92 | } |
92 | else if (HasAnimation(animID)) | 93 | else if (HasAnimation(animID)) |
93 | { | 94 | { |
@@ -119,6 +120,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
119 | if (m_defaultAnimation.AnimID != animID) | 120 | if (m_defaultAnimation.AnimID != animID) |
120 | { | 121 | { |
121 | m_defaultAnimation = new OpenSim.Framework.Animation(animID, sequenceNum, objectID); | 122 | m_defaultAnimation = new OpenSim.Framework.Animation(animID, sequenceNum, objectID); |
123 | m_implicitDefaultAnimation = m_defaultAnimation; | ||
122 | return true; | 124 | return true; |
123 | } | 125 | } |
124 | return false; | 126 | return false; |