diff options
author | Diva Canto | 2012-03-09 09:48:12 -0800 |
---|---|---|
committer | Diva Canto | 2012-03-09 09:48:12 -0800 |
commit | 81869c4a3fbb3bfbc2a767e381a0820165b461b2 (patch) | |
tree | 639c6f2798022346169646e91bae954c16cdea44 /OpenSim/Region | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-81869c4a3fbb3bfbc2a767e381a0820165b461b2.zip opensim-SC_OLD-81869c4a3fbb3bfbc2a767e381a0820165b461b2.tar.gz opensim-SC_OLD-81869c4a3fbb3bfbc2a767e381a0820165b461b2.tar.bz2 opensim-SC_OLD-81869c4a3fbb3bfbc2a767e381a0820165b461b2.tar.xz |
More on HG inventory transfers. Move the FireAndForget higher up.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 9921e11..d2fe388 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
206 | m_assMapper.Get(item.AssetID, sender, userAssetServer); | 206 | m_assMapper.Get(item.AssetID, sender, userAssetServer); |
207 | 207 | ||
208 | if (IsForeignUser(receiver, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) | 208 | if (IsForeignUser(receiver, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) |
209 | Util.FireAndForget(delegate { m_assMapper.Post(item.AssetID, receiver, userAssetServer); }); | 209 | m_assMapper.Post(item.AssetID, receiver, userAssetServer); |
210 | } | 210 | } |
211 | 211 | ||
212 | public override bool IsForeignUser(UUID userID, out string assetServerURL) | 212 | public override bool IsForeignUser(UUID userID, out string assetServerURL) |
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()) |