diff options
| author | Diva Canto | 2012-12-09 15:31:11 -0800 |
|---|---|---|
| committer | Diva Canto | 2012-12-09 15:31:11 -0800 |
| commit | cb80d8a29c0af24421a51087ddb56ad35a5c49b8 (patch) | |
| tree | 10b0abde0906e021c8459969bb7191d055f85d9d /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Replaced Mono.Addins dlls with ones compiled in Windows 64-bit. (diff) | |
| download | opensim-SC-cb80d8a29c0af24421a51087ddb56ad35a5c49b8.zip opensim-SC-cb80d8a29c0af24421a51087ddb56ad35a5c49b8.tar.gz opensim-SC-cb80d8a29c0af24421a51087ddb56ad35a5c49b8.tar.bz2 opensim-SC-cb80d8a29c0af24421a51087ddb56ad35a5c49b8.tar.xz | |
UserManagementModule: search the local cache for names too.
Inventory transfers: don't do async on asset transfers or now.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -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 ad40d6b..e0f3c99 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -692,7 +692,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 692 | { | 692 | { |
| 693 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); | 693 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); |
| 694 | if (invAccess != null) | 694 | if (invAccess != null) |
| 695 | Util.FireAndForget(delegate { invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); }); | 695 | invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); |
| 696 | } | 696 | } |
| 697 | 697 | ||
| 698 | if (!Permissions.BypassPermissions()) | 698 | if (!Permissions.BypassPermissions()) |