diff options
author | Melanie Thielker | 2009-02-17 04:16:42 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-02-17 04:16:42 +0000 |
commit | 31307849342c36c133b5cb8039296116c5456136 (patch) | |
tree | 1922584dea8426a8d81873d4d68b552e9761add2 /OpenSim/Region/ScriptEngine | |
parent | Small change on dealing with ODE physics, so that this warning doesn't happen... (diff) | |
download | opensim-SC-31307849342c36c133b5cb8039296116c5456136.zip opensim-SC-31307849342c36c133b5cb8039296116c5456136.tar.gz opensim-SC-31307849342c36c133b5cb8039296116c5456136.tar.bz2 opensim-SC-31307849342c36c133b5cb8039296116c5456136.tar.xz |
Re-add the objectID field to the anim pack, that was deemed unneccessary
and dropped nonths ago, because it is required to get smooth region
crossings with AO running. Without it, in some corner cases, anims will
continue to run in an unstoppable state.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e5f097f..5f6ea16 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2854,9 +2854,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2854 | // Do NOT try to parse UUID, animations cannot be triggered by ID | 2854 | // Do NOT try to parse UUID, animations cannot be triggered by ID |
2855 | UUID animID=InventoryKey(anim, (int)AssetType.Animation); | 2855 | UUID animID=InventoryKey(anim, (int)AssetType.Animation); |
2856 | if (animID == UUID.Zero) | 2856 | if (animID == UUID.Zero) |
2857 | presence.AddAnimation(anim); | 2857 | presence.AddAnimation(anim, m_host.UUID); |
2858 | else | 2858 | else |
2859 | presence.AddAnimation(animID); | 2859 | presence.AddAnimation(animID, m_host.UUID); |
2860 | } | 2860 | } |
2861 | } | 2861 | } |
2862 | } | 2862 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index eeef58b..564648b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -559,7 +559,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
559 | if (World.Entities.ContainsKey((UUID)avatar) && World.Entities[avatarID] is ScenePresence) | 559 | if (World.Entities.ContainsKey((UUID)avatar) && World.Entities[avatarID] is ScenePresence) |
560 | { | 560 | { |
561 | ScenePresence target = (ScenePresence)World.Entities[avatarID]; | 561 | ScenePresence target = (ScenePresence)World.Entities[avatarID]; |
562 | target.AddAnimation(animation); | 562 | target.AddAnimation(animation, m_host.UUID); |
563 | } | 563 | } |
564 | } | 564 | } |
565 | 565 | ||