OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
avinationmerge
Melanie 2012-10-26 21:47:41 +01:00
parent 26cc57b6ca 1c5f6e48b8
commit f3f794a122
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
View File

@ -41,12 +41,13 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private OpenSim.Framework.Animation m_implicitDefaultAnimation = new OpenSim.Framework.Animation();
private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation();
private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>();
public OpenSim.Framework.Animation DefaultAnimation
public OpenSim.Framework.Animation ImplicitDefaultAnimation
{
get { return m_defaultAnimation; }
get { return m_implicitDefaultAnimation; }
}
public AnimationSet()
@ -87,7 +88,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{
if (m_defaultAnimation.AnimID == animID)
{
m_defaultAnimation = new OpenSim.Framework.Animation(animID, 1, UUID.Zero);
m_defaultAnimation = new OpenSim.Framework.Animation(UUID.Zero, 1, UUID.Zero);
}
else if (HasAnimation(animID))
{
@ -119,6 +120,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
if (m_defaultAnimation.AnimID != animID)
{
m_defaultAnimation = new OpenSim.Framework.Animation(animID, sequenceNum, objectID);
m_implicitDefaultAnimation = m_defaultAnimation;
return true;
}
return false;

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -3275,7 +3275,7 @@ namespace OpenSim.Region.Framework.Scenes
cAgent.Anims = Animator.Animations.ToArray();
}
catch { }
cAgent.DefaultAnim = Animator.Animations.DefaultAnimation;
cAgent.DefaultAnim = Animator.Animations.ImplicitDefaultAnimation;
if (Scene.AttachmentsModule != null)
Scene.AttachmentsModule.CopyAttachments(this, cAgent);

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6122,7 +6122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
flags |= ScriptBaseClass.AGENT_SITTING;
}
if (agent.Animator.Animations.DefaultAnimation.AnimID
if (agent.Animator.Animations.ImplicitDefaultAnimation.AnimID
== DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
{
flags |= ScriptBaseClass.AGENT_SITTING;
@ -8584,7 +8584,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// and standing avatar since server 1.36
LSL_Vector lower;
LSL_Vector upper;
if (presence.Animator.Animations.DefaultAnimation.AnimID
if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID
== DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
{
// This is for ground sitting avatars