From 81869c4a3fbb3bfbc2a767e381a0820165b461b2 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 9 Mar 2012 09:48:12 -0800 Subject: [PATCH] More on HG inventory transfers. Move the FireAndForget higher up. --- .../Framework/InventoryAccess/HGInventoryAccessModule.cs | 2 +- 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 9921e1171a..d2fe3888fa 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 m_assMapper.Get(item.AssetID, sender, userAssetServer); if (IsForeignUser(receiver, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) - Util.FireAndForget(delegate { m_assMapper.Post(item.AssetID, receiver, userAssetServer); }); + m_assMapper.Post(item.AssetID, receiver, userAssetServer); } 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 23f39a8c6d..6ae4adc227 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 { IInventoryAccessModule invAccess = RequestModuleInterface(); if (invAccess != null) - invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); + Util.FireAndForget(delegate { invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); }); } if (!Permissions.BypassPermissions())