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

a few code cosmetic changes

LSLKeyTest
UbitUmarov 2015-12-25 10:43:51 +00:00
parent 7430c629aa
commit b7ea5c4967
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -991,32 +991,41 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
private void AvatarPlayAnimation(string avatar, string animation)
{
UUID avatarID = (UUID)avatar;
m_host.AddScriptLPS(1);
if (World.Entities.ContainsKey((UUID)avatar) && World.Entities[avatarID] is ScenePresence)
UUID avatarID;
if(!UUID.TryParse(avatar, out avatarID))
return;
if(!World.Entities.ContainsKey(avatarID))
return;
ScenePresence target = null;
if ((World.Entities[avatarID] is ScenePresence))
target = (ScenePresence)World.Entities[avatarID];
if (target == null)
return;
UUID animID = UUID.Zero;
m_host.TaskInventory.LockItemsForRead(true);
foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
{
ScenePresence target = (ScenePresence)World.Entities[avatarID];
if (target != null)
if (inv.Value.Type == (int)AssetType.Animation)
{
UUID animID=UUID.Zero;
m_host.TaskInventory.LockItemsForRead(true);
foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
{
if (inv.Value.Name == animation)
{
if (inv.Value.Type == (int)AssetType.Animation)
animID = inv.Value.AssetID;
continue;
}
}
m_host.TaskInventory.LockItemsForRead(false);
if (animID == UUID.Zero)
target.Animator.AddAnimation(animation, m_host.UUID);
else
target.Animator.AddAnimation(animID, m_host.UUID);
if (inv.Value.Name == animation)
{
animID = inv.Value.AssetID;
break;
}
}
}
m_host.TaskInventory.LockItemsForRead(false);
if (animID == UUID.Zero)
target.Animator.AddAnimation(animation, m_host.UUID);
else
target.Animator.AddAnimation(animID, m_host.UUID);
}
public void osAvatarStopAnimation(string avatar, string animation)