ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source
This commit is contained in:
Melanie
2012-05-13 01:25:03 +01:00
parent e5653ebeb7 9870d7e4e7
commit fe029cf4e8
11 changed files with 129 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
View File

@@ -79,13 +79,13 @@ namespace OpenSim.Region.Framework.Scenes.Animation
m_scenePresence = sp;
CurrentMovementAnimation = "CROUCH";
}
public void AddAnimation(UUID animID, UUID objectID)
{
if (m_scenePresence.IsChildAgent)
return;
// m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Adding animation {0} for {1}", animID, m_scenePresence.Name);
// m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Adding animation {0} for {1}", animID, m_scenePresence.Name);
if (m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, objectID))
SendAnimPack();
@@ -117,6 +117,22 @@ namespace OpenSim.Region.Framework.Scenes.Animation
SendAnimPack();
}
public void avnChangeAnim(UUID animID, bool addRemove, bool sendPack)
{
if (m_scenePresence.IsChildAgent)
return;
if (animID != UUID.Zero)
{
if (addRemove)
m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero);
else
m_animations.Remove(animID);
}
if(sendPack)
SendAnimPack();
}
// Called from scripts
public void RemoveAnimation(string name)
{