diff options
| author | Justin Clark-Casey (justincc) | 2013-05-09 22:43:16 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-05-09 22:43:16 +0100 |
| commit | 9978f36d9f4edf89168093c0cd9b15281e02dc2a (patch) | |
| tree | 916dfea2a83bc82dbb5e9b1ccc314558d0ed3d3c /OpenSim | |
| parent | Only send one kill object to the deleter when they derez an object rather tha... (diff) | |
| download | opensim-SC-9978f36d9f4edf89168093c0cd9b15281e02dc2a.zip opensim-SC-9978f36d9f4edf89168093c0cd9b15281e02dc2a.tar.gz opensim-SC-9978f36d9f4edf89168093c0cd9b15281e02dc2a.tar.bz2 opensim-SC-9978f36d9f4edf89168093c0cd9b15281e02dc2a.tar.xz | |
Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().
This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction.
This looks to address http://opensimulator.org/mantis/view.php?id=6600
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 8ddaa60..80581dc 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -490,7 +490,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 490 | item.SaleType = itemUpd.SaleType; | 490 | item.SaleType = itemUpd.SaleType; |
| 491 | 491 | ||
| 492 | InventoryService.UpdateItem(item); | 492 | InventoryService.UpdateItem(item); |
| 493 | remoteClient.SendBulkUpdateInventory(item); | 493 | |
| 494 | // We cannot send out a bulk update here, since this will cause editing of clothing to start | ||
| 495 | // failing frequently. Possibly this is a race with a separate transaction that uploads the asset. | ||
| 496 | // remoteClient.SendBulkUpdateInventory(item); | ||
| 494 | } | 497 | } |
| 495 | 498 | ||
| 496 | if (UUID.Zero != transactionID) | 499 | if (UUID.Zero != transactionID) |