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

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2022-01-31 21:30:40 +00:00
parent fc8c08ec8a
commit e011fb773e
1 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5252,28 +5252,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_String llGetAnimation(LSL_Key id)
{
// This should only return a value if the avatar is in the same region
if(!UUID.TryParse(id, out UUID avatar))
if(!UUID.TryParse(id, out UUID avatar) || avatar.IsZero())
return "";
ScenePresence presence = World.GetScenePresence(avatar);
if (presence == null)
return "";
if (presence == null || presence.IsChildAgent || presence.Animator == null)
return string.Empty;
if (m_host.RegionHandle == presence.RegionHandle)
{
if (presence != null)
{
// if (presence.SitGround)
// return "Sitting on Ground";
// if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero)
// return "Sitting";
//if (presence.SitGround)
// return "Sitting on Ground";
//if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero)
// return "Sitting";
string movementAnimation = presence.Animator.CurrentMovementAnimation;
if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out string lslMovementAnimation))
return lslMovementAnimation;
string movementAnimation = presence.Animator.CurrentMovementAnimation;
if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out string lslMovementAnimation))
return lslMovementAnimation;
}
}
return String.Empty;
return string.Empty;
}
public void llMessageLinked(int linknumber, int num, string msg, string id)
@@ -17381,6 +17375,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llSetAnimationOverride(LSL_String animState, LSL_String anim)
{
if (m_item.PermsGranter.IsZero())
{
llShout(ScriptBaseClass.DEBUG_CHANNEL, "No permission to override animations");
return;
}
if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_OVERRIDE_ANIMATIONS) == 0)
{
llShout(ScriptBaseClass.DEBUG_CHANNEL, "No permission to override animations");
return;
}
ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence == null)
return;
string state = String.Empty;
foreach (KeyValuePair<string, string> kvp in MovementAnimationsForLSL)
@@ -17398,22 +17408,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
}
if (m_item.PermsGranter.IsZero())
{
llShout(ScriptBaseClass.DEBUG_CHANNEL, "No permission to override animations");
return;
}
if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_OVERRIDE_ANIMATIONS) == 0)
{
llShout(ScriptBaseClass.DEBUG_CHANNEL, "No permission to override animations");
return;
}
ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence == null)
return;
UUID animID;