OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switched the order by which foreign inventory and foreign assets are brought in, to avoid race conditions on the client.

0.7.5-pf-bulletsim
Diva Canto 2012-12-09 22:03:21 -08:00
parent 39b388a094
commit b8178f5a50
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -688,12 +688,10 @@ namespace OpenSim.Region.Framework.Scenes
itemCopy.SalePrice = item.SalePrice; itemCopy.SalePrice = item.SalePrice;
itemCopy.SaleType = item.SaleType; itemCopy.SaleType = item.SaleType;
if (AddInventoryItem(itemCopy))
{
IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
if (invAccess != null) if (invAccess != null)
invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); invAccess.TransferInventoryAssets(itemCopy, senderId, recipient);
} AddInventoryItem(itemCopy);
if (!Permissions.BypassPermissions()) if (!Permissions.BypassPermissions())
{ {