aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorKitto Flora2010-03-14 16:23:12 -0400
committerKitto Flora2010-03-14 16:23:12 -0400
commit8cbd0d3b5f2a8301b597077918379d57fa007e97 (patch)
treec3b242f14f85746ddb11be8461c82acdf321d5bf /OpenSim/Region/ScriptEngine/Shared/Api
parentRotLookAt repaired; debug msg cleanup. (diff)
parentFix the delay in llGiveInventory so that it only takes effect when giving inv... (diff)
downloadopensim-SC-8cbd0d3b5f2a8301b597077918379d57fa007e97.zip
opensim-SC-8cbd0d3b5f2a8301b597077918379d57fa007e97.tar.gz
opensim-SC-8cbd0d3b5f2a8301b597077918379d57fa007e97.tar.bz2
opensim-SC-8cbd0d3b5f2a8301b597077918379d57fa007e97.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs7
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 83f7db0..8e5c203 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4016,14 +4016,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4016 bucket); 4016 bucket);
4017 4017
4018 if (m_TransferModule != null) 4018 if (m_TransferModule != null)
4019 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4019 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4020
4021 //This delay should only occur when giving inventory to avatars.
4022 ScriptSleep(3000);
4020 } 4023 }
4021 else 4024 else
4022 { 4025 {
4023 // destination is an object 4026 // destination is an object
4024 World.MoveTaskInventoryItem(destId, m_host, objId); 4027 World.MoveTaskInventoryItem(destId, m_host, objId);
4025 } 4028 }
4026 ScriptSleep(3000); 4029
4027 } 4030 }
4028 4031
4029 [DebuggerNonUserCode] 4032 [DebuggerNonUserCode]