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

This commit is contained in:
Kitto Flora
2010-03-14 16:23:12 -04:00

View File

@@ -4016,14 +4016,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
bucket);
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
{
// destination is an object
World.MoveTaskInventoryItem(destId, m_host, objId);
}
ScriptSleep(3000);
}
[DebuggerNonUserCode]