* Make inventory operations sync rather than async. This is to alleviate race conditions such as that in mantis #190

* Make inventory messages more verbose.  Hopefully they aren't now too verbose
* This may resolve some grid instability but it's likely there's much more out there.

2 files changed, 13 insertions, 29 deletions

diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 4f5d9ab..709a227 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -117,45 +117,26 @@ namespace OpenSim.Region.Communications.OGS1
 
         public void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder)
         {
-            try
-            {
-                RestObjectPoster.BeginPostObject<InventoryFolderBase>(_inventoryServerUrl + "/NewFolder/", folder);
-            }
-            catch (Exception)
-            {
-            }
+            SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
+                "POST", _inventoryServerUrl + "/NewFolder/", folder);
         }
 
         public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder)
         {
-            try
-            {
-                RestObjectPoster.BeginPostObject<InventoryFolderBase>(_inventoryServerUrl + "/MoveFolder/", folder);
-            }
-            catch (Exception)
-            {
-            }
+            SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
+                "POST", _inventoryServerUrl + "/MoveFolder/", folder);
         }
+        
         public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
         {
-            try
-            {
-                RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/NewItem/", item);
-            }
-            catch (Exception)
-            {
-            }
+            SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
+                "POST", _inventoryServerUrl + "/NewItem/", item);
         }
 
         public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
         {
-            try
-            {
-                RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/DeleteItem/", item);
-            }
-            catch (Exception)
-            {
-            }
+            SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
+                "POST", _inventoryServerUrl + "/DeleteItem/", item);
         }
 
         public void CreateNewUserInventory(LLUUID user)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 710e443..7026fea 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -238,7 +238,10 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void MoveInventoryItem(IClientAPI remoteClient,LLUUID folderID, LLUUID itemID, int length, string newName)
         {
-            MainLog.Instance.Verbose("INVENTORY", "Moving item for " + remoteClient.AgentId.ToStringHyphenated());
+            MainLog.Instance.Verbose(
+                "INVENTORY", 
+                "Moving item for " + remoteClient.AgentId.ToStringHyphenated());
+            
             CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
             if (userInfo == null)
             {