ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

*TEST* add movement states SIT and SITGROUND. ScenePresence on SIT,

Browse Source 
SITGROUND or STAND, sets directly the state, and desired sitAnimation for
default sits
This commit is contained in:
UbitUmarov
2014-09-10 19:30:57 +01:00
parent 0caa59b286
commit f66b58cf00
3 changed files with 74 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,25 +132,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
private Dictionary<string, string> MovementAnimationsForLSL =
new Dictionary<string, string> {
{"CROUCH", "Crouching"},
{"CROUCHWALK", "CrouchWalking"},
{"FALLDOWN", "Falling Down"},
{"FLY", "Flying"},
{"FLYSLOW", "FlyingSlow"},
{"HOVER", "Hovering"},
{"HOVER_UP", "Hovering Up"},
{"HOVER_DOWN", "Hovering Down"},
{"HOVER", "Hovering"},
{"LAND", "Landing"},
{"FALLDOWN", "Falling Down"},
{"PREJUMP", "PreJumping"},
{"JUMP", "Jumping"},
{"STANDUP", "Standing Up"},
{"SOFT_LAND", "Soft Landing"},
{"STAND", "Standing"},
{"CROUCHWALK", "CrouchWalking"},
{"LAND", "Landing"},
{"PREJUMP", "PreJumping"},
{"RUN", "Running"},
{"WALK", "Walking"},
{"CROUCH", "Crouching"},
{"SIT","Sitting"},
{"SITGROUND","Sitting on Ground"},
{"STAND", "Standing"},
{"STANDUP", "Standing Up"},
{"STRIDE","Striding"},
{"SOFT_LAND", "Soft Landing"},
{"TURNLEFT", "Turning Left"},
{"TURNRIGHT", "Turning Right"}
{"TURNRIGHT", "Turning Right"},
{"WALK", "Walking"}
};
//An array of HTTP/1.1 headers that are not allowed to be used
//as custom headers by llHTTPRequest.
private string[] HttpStandardHeaders =
@@ -4884,10 +4888,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
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;
string lslMovementAnimation;