diff options
author | Melanie | 2012-03-09 22:59:23 +0000 |
---|---|---|
committer | Melanie | 2012-03-09 22:59:23 +0000 |
commit | 5c5a49379118330627af0b5648e6ce83a3b209ea (patch) | |
tree | 2791f811ea42039e59098490cf0835add25c319f /OpenSim/Region/Framework/Scenes | |
parent | fix for NPC not playing internal animations (diff) | |
parent | More on inventory transfer hold ups: (diff) | |
download | opensim-SC-5c5a49379118330627af0b5648e6ce83a3b209ea.zip opensim-SC-5c5a49379118330627af0b5648e6ce83a3b209ea.tar.gz opensim-SC-5c5a49379118330627af0b5648e6ce83a3b209ea.tar.bz2 opensim-SC-5c5a49379118330627af0b5648e6ce83a3b209ea.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 23f39a8..6ae4adc 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -633,7 +633,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
633 | { | 633 | { |
634 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); | 634 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); |
635 | if (invAccess != null) | 635 | if (invAccess != null) |
636 | invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); | 636 | Util.FireAndForget(delegate { invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); }); |
637 | } | 637 | } |
638 | 638 | ||
639 | if (!Permissions.BypassPermissions()) | 639 | if (!Permissions.BypassPermissions()) |