diff options
author | Melanie Thielker | 2014-09-09 20:16:02 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-09-09 20:16:02 +0200 |
commit | 2d2823f1deb833a3d60ac6f4eb49f04c6cb7bdd2 (patch) | |
tree | aa271af59e093c2db1280cdaf1f61b8bea679df2 /OpenSim | |
parent | Merge branch 'master' into ubitworkmaster (diff) | |
download | opensim-SC-2d2823f1deb833a3d60ac6f4eb49f04c6cb7bdd2.zip opensim-SC-2d2823f1deb833a3d60ac6f4eb49f04c6cb7bdd2.tar.gz opensim-SC-2d2823f1deb833a3d60ac6f4eb49f04c6cb7bdd2.tar.bz2 opensim-SC-2d2823f1deb833a3d60ac6f4eb49f04c6cb7bdd2.tar.xz |
Add some case magic and send an anim pack when an override is set
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4aa38be..cecb9cf 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -6035,6 +6035,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
6035 | public void SetAnimationOverride(string animState, UUID animID) | 6035 | public void SetAnimationOverride(string animState, UUID animID) |
6036 | { | 6036 | { |
6037 | Overrides.SetOverride(animState, animID); | 6037 | Overrides.SetOverride(animState, animID); |
6038 | Animator.SendAnimPack(); | ||
6038 | } | 6039 | } |
6039 | } | 6040 | } |
6040 | } | 6041 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ef8f0ed..04ed0d1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -13494,7 +13494,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13494 | 13494 | ||
13495 | foreach (KeyValuePair<string, string> kvp in MovementAnimationsForLSL) | 13495 | foreach (KeyValuePair<string, string> kvp in MovementAnimationsForLSL) |
13496 | { | 13496 | { |
13497 | if (kvp.Value == animState) | 13497 | if (kvp.Value.ToLower() == ((string)animState).ToLower()) |
13498 | { | 13498 | { |
13499 | state = kvp.Key; | 13499 | state = kvp.Key; |
13500 | break; | 13500 | break; |