aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2012-12-09 22:03:21 -0800
committerDiva Canto2012-12-09 22:03:21 -0800
commitb8178f5a509caf897dac0660db47ea9a5224194a (patch)
tree82d29d695e74e285be6802c8d6a3f45fd1c40d2f /OpenSim
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-b8178f5a509caf897dac0660db47ea9a5224194a.zip
opensim-SC_OLD-b8178f5a509caf897dac0660db47ea9a5224194a.tar.gz
opensim-SC_OLD-b8178f5a509caf897dac0660db47ea9a5224194a.tar.bz2
opensim-SC_OLD-b8178f5a509caf897dac0660db47ea9a5224194a.tar.xz
Switched the order by which foreign inventory and foreign assets are brought in, to avoid race conditions on the client.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs10
1 files changed, 4 insertions, 6 deletions
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
688 itemCopy.SalePrice = item.SalePrice; 688 itemCopy.SalePrice = item.SalePrice;
689 itemCopy.SaleType = item.SaleType; 689 itemCopy.SaleType = item.SaleType;
690 690
691 if (AddInventoryItem(itemCopy)) 691 IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
692 { 692 if (invAccess != null)
693 IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); 693 invAccess.TransferInventoryAssets(itemCopy, senderId, recipient);
694 if (invAccess != null) 694 AddInventoryItem(itemCopy);
695 invAccess.TransferInventoryAssets(itemCopy, senderId, recipient);
696 }
697 695
698 if (!Permissions.BypassPermissions()) 696 if (!Permissions.BypassPermissions())
699 { 697 {