Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

avinationmerge
Kitto Flora 2010-03-14 16:23:12 -04:00
commit 8cbd0d3b5f
1 changed files with 5 additions and 2 deletions

View File

@ -4017,13 +4017,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_TransferModule != null) if (m_TransferModule != null)
m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
//This delay should only occur when giving inventory to avatars.
ScriptSleep(3000);
} }
else else
{ {
// destination is an object // destination is an object
World.MoveTaskInventoryItem(destId, m_host, objId); World.MoveTaskInventoryItem(destId, m_host, objId);
} }
ScriptSleep(3000);
} }
[DebuggerNonUserCode] [DebuggerNonUserCode]