From b8178f5a509caf897dac0660db47ea9a5224194a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 9 Dec 2012 22:03:21 -0800
Subject: Switched the order by which foreign inventory and foreign assets are
 brought in, to avoid race conditions on the client.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index e0f3c99..5c8b097 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -688,12 +688,10 @@ namespace OpenSim.Region.Framework.Scenes
             itemCopy.SalePrice = item.SalePrice;
             itemCopy.SaleType = item.SaleType;
 
-            if (AddInventoryItem(itemCopy))
-            {
-                IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
-                if (invAccess != null)
-                    invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); 
-            }
+            IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
+            if (invAccess != null)
+                invAccess.TransferInventoryAssets(itemCopy, senderId, recipient);
+            AddInventoryItem(itemCopy);
 
             if (!Permissions.BypassPermissions())
             {
-- 
cgit v1.1