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

SITGROUND or STAND, sets directly the state, and desired sitAnimation for
default sits

1 files changed, 17 insertions, 13 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 755646f..ca682d3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -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"},
+                        {"JUMP", "Jumping"},
                         {"LAND", "Landing"},
-                        {"FALLDOWN", "Falling Down"},
                         {"PREJUMP", "PreJumping"},
-                        {"JUMP", "Jumping"},
+                        {"RUN", "Running"},
+                        {"SIT","Sitting"},
+                        {"SITGROUND","Sitting on Ground"},
+                        {"STAND", "Standing"},
                         {"STANDUP", "Standing Up"},
+                        {"STRIDE","Striding"},
                         {"SOFT_LAND", "Soft Landing"},
-                        {"STAND", "Standing"},
-                        {"CROUCHWALK", "CrouchWalking"},
-                        {"RUN", "Running"},
-                        {"WALK", "Walking"},
-                        {"CROUCH", "Crouching"},
                         {"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;