aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-10-26 21:47:41 +0100
committerMelanie2012-10-26 21:47:41 +0100
commitf3f794a12292e2abfdaecaa68b87663f27619277 (patch)
tree17db09a28875bd0da13112c9601ef140e5e96ebd /OpenSim/Region/Framework
parentMerge branch 'master' into careminster (diff)
parentSeparate LSL's notion of the default anim from the actually playing anims. (diff)
downloadopensim-SC_OLD-f3f794a12292e2abfdaecaa68b87663f27619277.zip
opensim-SC_OLD-f3f794a12292e2abfdaecaa68b87663f27619277.tar.gz
opensim-SC_OLD-f3f794a12292e2abfdaecaa68b87663f27619277.tar.bz2
opensim-SC_OLD-f3f794a12292e2abfdaecaa68b87663f27619277.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 6 insertions, 4 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;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5be826d..870bd66 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3275,7 +3275,7 @@ namespace OpenSim.Region.Framework.Scenes
3275 cAgent.Anims = Animator.Animations.ToArray(); 3275 cAgent.Anims = Animator.Animations.ToArray();
3276 } 3276 }
3277 catch { } 3277 catch { }
3278 cAgent.DefaultAnim = Animator.Animations.DefaultAnimation; 3278 cAgent.DefaultAnim = Animator.Animations.ImplicitDefaultAnimation;
3279 3279
3280 if (Scene.AttachmentsModule != null) 3280 if (Scene.AttachmentsModule != null)
3281 Scene.AttachmentsModule.CopyAttachments(this, cAgent); 3281 Scene.AttachmentsModule.CopyAttachments(this, cAgent);