aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
3 files changed, 8 insertions, 6 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);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8d8df1d..9011966 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6122,7 +6122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6122 flags |= ScriptBaseClass.AGENT_SITTING; 6122 flags |= ScriptBaseClass.AGENT_SITTING;
6123 } 6123 }
6124 6124
6125 if (agent.Animator.Animations.DefaultAnimation.AnimID 6125 if (agent.Animator.Animations.ImplicitDefaultAnimation.AnimID
6126 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 6126 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
6127 { 6127 {
6128 flags |= ScriptBaseClass.AGENT_SITTING; 6128 flags |= ScriptBaseClass.AGENT_SITTING;
@@ -8584,7 +8584,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8584 // and standing avatar since server 1.36 8584 // and standing avatar since server 1.36
8585 LSL_Vector lower; 8585 LSL_Vector lower;
8586 LSL_Vector upper; 8586 LSL_Vector upper;
8587 if (presence.Animator.Animations.DefaultAnimation.AnimID 8587 if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID
8588 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 8588 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
8589 { 8589 {
8590 // This is for ground sitting avatars 8590 // This is for ground sitting avatars