diff options
author | UbitUmarov | 2014-09-10 19:30:57 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-10 19:30:57 +0100 |
commit | f66b58cf00d4dcbd9d11030809bf9766330966f2 (patch) | |
tree | 40cf47bda3160e03d1d94918a795179b01ca2778 /OpenSim/Region/ScriptEngine | |
parent | Fix a nullref that can hit Vivox voice (diff) | |
download | opensim-SC_OLD-f66b58cf00d4dcbd9d11030809bf9766330966f2.zip opensim-SC_OLD-f66b58cf00d4dcbd9d11030809bf9766330966f2.tar.gz opensim-SC_OLD-f66b58cf00d4dcbd9d11030809bf9766330966f2.tar.bz2 opensim-SC_OLD-f66b58cf00d4dcbd9d11030809bf9766330966f2.tar.xz |
*TEST* add movement states SIT and SITGROUND. ScenePresence on SIT,
SITGROUND or STAND, sets directly the state, and desired sitAnimation for
default sits
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 30 |
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 | |||
132 | 132 | ||
133 | private Dictionary<string, string> MovementAnimationsForLSL = | 133 | private Dictionary<string, string> MovementAnimationsForLSL = |
134 | new Dictionary<string, string> { | 134 | new Dictionary<string, string> { |
135 | {"CROUCH", "Crouching"}, | ||
136 | {"CROUCHWALK", "CrouchWalking"}, | ||
137 | {"FALLDOWN", "Falling Down"}, | ||
135 | {"FLY", "Flying"}, | 138 | {"FLY", "Flying"}, |
136 | {"FLYSLOW", "FlyingSlow"}, | 139 | {"FLYSLOW", "FlyingSlow"}, |
140 | {"HOVER", "Hovering"}, | ||
137 | {"HOVER_UP", "Hovering Up"}, | 141 | {"HOVER_UP", "Hovering Up"}, |
138 | {"HOVER_DOWN", "Hovering Down"}, | 142 | {"HOVER_DOWN", "Hovering Down"}, |
139 | {"HOVER", "Hovering"}, | 143 | {"JUMP", "Jumping"}, |
140 | {"LAND", "Landing"}, | 144 | {"LAND", "Landing"}, |
141 | {"FALLDOWN", "Falling Down"}, | ||
142 | {"PREJUMP", "PreJumping"}, | 145 | {"PREJUMP", "PreJumping"}, |
143 | {"JUMP", "Jumping"}, | 146 | {"RUN", "Running"}, |
147 | {"SIT","Sitting"}, | ||
148 | {"SITGROUND","Sitting on Ground"}, | ||
149 | {"STAND", "Standing"}, | ||
144 | {"STANDUP", "Standing Up"}, | 150 | {"STANDUP", "Standing Up"}, |
151 | {"STRIDE","Striding"}, | ||
145 | {"SOFT_LAND", "Soft Landing"}, | 152 | {"SOFT_LAND", "Soft Landing"}, |
146 | {"STAND", "Standing"}, | ||
147 | {"CROUCHWALK", "CrouchWalking"}, | ||
148 | {"RUN", "Running"}, | ||
149 | {"WALK", "Walking"}, | ||
150 | {"CROUCH", "Crouching"}, | ||
151 | {"TURNLEFT", "Turning Left"}, | 153 | {"TURNLEFT", "Turning Left"}, |
152 | {"TURNRIGHT", "Turning Right"} | 154 | {"TURNRIGHT", "Turning Right"}, |
155 | {"WALK", "Walking"} | ||
153 | }; | 156 | }; |
157 | |||
154 | //An array of HTTP/1.1 headers that are not allowed to be used | 158 | //An array of HTTP/1.1 headers that are not allowed to be used |
155 | //as custom headers by llHTTPRequest. | 159 | //as custom headers by llHTTPRequest. |
156 | private string[] HttpStandardHeaders = | 160 | private string[] HttpStandardHeaders = |
@@ -4884,10 +4888,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4884 | { | 4888 | { |
4885 | if (presence != null) | 4889 | if (presence != null) |
4886 | { | 4890 | { |
4887 | if (presence.SitGround) | 4891 | // if (presence.SitGround) |
4888 | return "Sitting on Ground"; | 4892 | // return "Sitting on Ground"; |
4889 | if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero) | 4893 | // if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero) |
4890 | return "Sitting"; | 4894 | // return "Sitting"; |
4891 | 4895 | ||
4892 | string movementAnimation = presence.Animator.CurrentMovementAnimation; | 4896 | string movementAnimation = presence.Animator.CurrentMovementAnimation; |
4893 | string lslMovementAnimation; | 4897 | string lslMovementAnimation; |