Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs

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 d2e41f8..257e070 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -485,7 +485,10 @@ namespace OpenSim.Region.Framework.Scenes
                     item.SaleType = itemUpd.SaleType;
 
                     InventoryService.UpdateItem(item);
-                    remoteClient.SendBulkUpdateInventory(item);
+
+                    // We cannot send out a bulk update here, since this will cause editing of clothing to start 
+                    // failing frequently.  Possibly this is a race with a separate transaction that uploads the asset.
+//                    remoteClient.SendBulkUpdateInventory(item);
                 }
 
                 if (UUID.Zero != transactionID)