diff options
author | CasperW | 2010-03-13 15:13:19 +0100 |
---|---|---|
committer | CasperW | 2010-03-13 15:13:19 +0100 |
commit | 80e4068b3e85625234270cd7f3735cfd1b4e83dc (patch) | |
tree | 3c573458610cbe3fab022e2e1053f8597be9ccd0 /OpenSim | |
parent | Fix Rotation Lock. NOTE: This version had poor border crossing control (diff) | |
download | opensim-SC_OLD-80e4068b3e85625234270cd7f3735cfd1b4e83dc.zip opensim-SC_OLD-80e4068b3e85625234270cd7f3735cfd1b4e83dc.tar.gz opensim-SC_OLD-80e4068b3e85625234270cd7f3735cfd1b4e83dc.tar.bz2 opensim-SC_OLD-80e4068b3e85625234270cd7f3735cfd1b4e83dc.tar.xz |
Fix the delay in llGiveInventory so that it only takes effect when giving inventory to an avatar (this now replicates SL behaviour)
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 180fba9..0117fa0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4014,14 +4014,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4014 | bucket); | 4014 | bucket); |
4015 | 4015 | ||
4016 | if (m_TransferModule != null) | 4016 | if (m_TransferModule != null) |
4017 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 4017 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
4018 | |||
4019 | //This delay should only occur when giving inventory to avatars. | ||
4020 | ScriptSleep(3000); | ||
4018 | } | 4021 | } |
4019 | else | 4022 | else |
4020 | { | 4023 | { |
4021 | // destination is an object | 4024 | // destination is an object |
4022 | World.MoveTaskInventoryItem(destId, m_host, objId); | 4025 | World.MoveTaskInventoryItem(destId, m_host, objId); |
4023 | } | 4026 | } |
4024 | ScriptSleep(3000); | 4027 | |
4025 | } | 4028 | } |
4026 | 4029 | ||
4027 | [DebuggerNonUserCode] | 4030 | [DebuggerNonUserCode] |