5 files changed, 6 insertions, 18 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index 125501b..08217dc 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -431,12 +431,6 @@ namespace OpenSim.Data.MSSQL
 
         public void StoreLandObject(ILandObject parcel)
         {
-            // Instance.StoreLandObject(parcel, regionUUID);
-
-            // Does the new locking fix it?
-            // m_log.Info("[DATASTORE]: Tedds temp fix: Waiting 3 seconds to avoid others writing to table while we hold a dataset of it. (Someone please fix! :))");
-            // System.Threading.Thread.Sleep(2500 + rnd.Next(0, 1000));
-
             lock (m_dataSet)
             {
                 DataTable land = m_landTable;
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index e8cc7d2..ea27346 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -268,12 +268,13 @@ namespace OpenSim.Framework.Communications.Cache
                 // inventory failure.
                 //
                 // This is a crude way of dealing with that by retrying the lookup.
+                //BUG: This should be replaced with a async event.
                 if (!userProfile.HasInventory)
                 {
                     int attempts = 5;
                     while (attempts-- > 0)
                     {
-                        Thread.Sleep(3000);
+                        Thread.Sleep(500);
                         
                         if (userProfile.HasInventory)
                         {
@@ -369,7 +370,7 @@ namespace OpenSim.Framework.Communications.Cache
                              "[INVENTORY CACHE]: Poll number {0} for inventory items in folder {1} for user {2}", 
                              attempts, folderID, agentID);
                         
-                        Thread.Sleep(3000);
+                        Thread.Sleep(500);
                         
                         if (userProfile.HasInventory)
                         {
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 4864185..2ba215b 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -60,9 +60,6 @@ namespace OpenSim.Grid.InventoryServer
             LLUUID userID = new LLUUID(rawUserID);
 
             m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID);
-            
-            // uncomment me to simulate an overloaded inventory server
-            //Thread.Sleep(18000);            
 
             InventoryCollection invCollection = new InventoryCollection();
             
@@ -114,9 +111,7 @@ namespace OpenSim.Grid.InventoryServer
         /// <param name="rawUserID"></param>
         /// <returns></returns>        
         public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
-        {
-            //Thread.Sleep(10000);
-            
+        {            
             LLUUID userID = new LLUUID(rawUserID);
             return GetInventorySkeleton(userID);
         }        
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index 7b1211f..a2ccc37 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -100,7 +100,8 @@ namespace OpenSim.Region.Modules.AvatarFactory
             }
             else
             {
-                Thread.Sleep(5000); //why is this here? 
+                // BUG: !? (Reduced from 5000 to 500 by Adam)
+                Thread.Sleep(500); //why is this here? 
 
                 //this is the first thread to request this appearance
                 //so let it check the db and if not found then create a default appearance
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index acc0cee..076dfdf 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1103,9 +1103,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                 {
                     if (prim.prim_geom != (IntPtr)0)
                     {
-
-                        
-                        //System.Threading.Thread.Sleep(20);
                         prim.ResetTaints();