* Allow folder renaming to complete after an agent inventory has been received by a region from the inventory service

* This replaces the old behaviour of failing straight away, which could cause lost updates if the inventory service was slow in responding
* This is the first baby step to making all inventory requests behave this way, to reduce inventory lossage

1 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 82ba7df..fe892ca 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -28,6 +28,8 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Threading;
+
 using libsecondlife;
 using log4net;
 using OpenSim.Framework;
@@ -108,7 +110,7 @@ namespace OpenSim.Grid.InventoryServer
         public InventoryCollection GetUserInventory(Guid rawUserID)
         {
             // uncomment me to simulate an overloaded inventory server
-            //Thread.Sleep(25000);
+            //Thread.Sleep(20000);
             
             LLUUID userID = new LLUUID(rawUserID);
 
@@ -165,6 +167,8 @@ namespace OpenSim.Grid.InventoryServer
         /// <returns></returns>        
         public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
         {
+            //Thread.Sleep(10000);
+            
             LLUUID userID = new LLUUID(rawUserID);
             return GetInventorySkeleton(userID);
         }