diff options
| author | Melanie | 2012-03-09 23:00:24 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-09 23:00:24 +0000 |
| commit | 3dbf754651033d8e5d15a2c7b4bab3a803c1e4e6 (patch) | |
| tree | d1b29f5a6f2f63e03e768b4d829e6c1771f441d6 /OpenSim/Region/Framework | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-3dbf754651033d8e5d15a2c7b4bab3a803c1e4e6.zip opensim-SC_OLD-3dbf754651033d8e5d15a2c7b4bab3a803c1e4e6.tar.gz opensim-SC_OLD-3dbf754651033d8e5d15a2c7b4bab3a803c1e4e6.tar.bz2 opensim-SC_OLD-3dbf754651033d8e5d15a2c7b4bab3a803c1e4e6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 719c300..d1739de 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -616,7 +616,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 616 | { | 616 | { |
| 617 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); | 617 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); |
| 618 | if (invAccess != null) | 618 | if (invAccess != null) |
| 619 | invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); | 619 | Util.FireAndForget(delegate { invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); }); |
| 620 | } | 620 | } |
| 621 | 621 | ||
| 622 | if (!Permissions.BypassPermissions()) | 622 | if (!Permissions.BypassPermissions()) |