ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ubitworkmaster

Browse Source
This commit is contained in:
UbitUmarov
2014-09-09 13:54:00 +01:00
parent 683f2cc892 347c5b3070
commit 46abe0c86d
4 changed files with 116 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13508,7 +13508,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
if (m_item.PermsGranter == UUID.Zero)
{
llShout(ScriptBaseClass.DEBUG_CHANNEL, "No permission to override animations");
return;
}
if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_OVERRIDE_ANIMATIONS) == 0)
{
@@ -13521,11 +13524,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (presence == null)
return;
UUID animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation);
if (animID == UUID.Zero)
UUID animID;
if (animState == anim)
{
llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found");
return;
animID = UUID.Zero;
}
else if (MovementAnimationsForLSL.ContainsKey(anim))
{
animID = DefaultAvatarAnimations.AnimsUUID[MovementAnimationsForLSL[anim]];
}
else
{
animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation);
if (animID == UUID.Zero)
{
llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found");
return;
}
}
presence.SetAnimationOverride(state, animID);