From 10d923dbeaa3eac8d085ab14bb8fab4a71e1fd29 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 11 Aug 2009 16:47:36 -0700
Subject: Fixes a race condition in EQ processing that was making EQs pop up
 again upon client close. Commented remote call on GetSystemFolders again, so
 that it's not live yet.

---
 .../Inventory/InventoryServiceConnector.cs         | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'OpenSim/Services/Connectors/Inventory')

diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 2244a7e..e41b427 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -164,20 +164,20 @@ namespace OpenSim.Services.Connectors
         public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID)
         {
             // !!! Not just yet.
-            try
-            {
-                List<InventoryFolderBase> folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject(
-                    "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString());
-                Dictionary<AssetType, InventoryFolderBase> dFolders = new Dictionary<AssetType, InventoryFolderBase>();
-                foreach (InventoryFolderBase f in folders)
-                    dFolders[(AssetType)f.Type] = f;
-                return dFolders;
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}",
-                     e.Source, e.Message);
-            }
+            //try
+            //{
+            //    List<InventoryFolderBase> folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject(
+            //        "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString());
+            //    Dictionary<AssetType, InventoryFolderBase> dFolders = new Dictionary<AssetType, InventoryFolderBase>();
+            //    foreach (InventoryFolderBase f in folders)
+            //        dFolders[(AssetType)f.Type] = f;
+            //    return dFolders;
+            //}
+            //catch (Exception e)
+            //{
+            //    m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}",
+            //         e.Source, e.Message);
+            //}
 
             return new Dictionary<AssetType, InventoryFolderBase>();
         }
-- 
cgit v1.1