aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2009-08-11 16:47:36 -0700
committerDiva Canto2009-08-11 16:47:36 -0700
commit10d923dbeaa3eac8d085ab14bb8fab4a71e1fd29 (patch)
tree9aedb7a830e3bf2c3638e010c21712851cc279b1 /OpenSim/Services
parentSome more hammering on the head of the obsolete rest inventory handlers, just... (diff)
downloadopensim-SC_OLD-10d923dbeaa3eac8d085ab14bb8fab4a71e1fd29.zip
opensim-SC_OLD-10d923dbeaa3eac8d085ab14bb8fab4a71e1fd29.tar.gz
opensim-SC_OLD-10d923dbeaa3eac8d085ab14bb8fab4a71e1fd29.tar.bz2
opensim-SC_OLD-10d923dbeaa3eac8d085ab14bb8fab4a71e1fd29.tar.xz
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.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs28
1 files changed, 14 insertions, 14 deletions
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
164 public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID) 164 public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID)
165 { 165 {
166 // !!! Not just yet. 166 // !!! Not just yet.
167 try 167 //try
168 { 168 //{
169 List<InventoryFolderBase> folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject( 169 // List<InventoryFolderBase> folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject(
170 "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); 170 // "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString());
171 Dictionary<AssetType, InventoryFolderBase> dFolders = new Dictionary<AssetType, InventoryFolderBase>(); 171 // Dictionary<AssetType, InventoryFolderBase> dFolders = new Dictionary<AssetType, InventoryFolderBase>();
172 foreach (InventoryFolderBase f in folders) 172 // foreach (InventoryFolderBase f in folders)
173 dFolders[(AssetType)f.Type] = f; 173 // dFolders[(AssetType)f.Type] = f;
174 return dFolders; 174 // return dFolders;
175 } 175 //}
176 catch (Exception e) 176 //catch (Exception e)
177 { 177 //{
178 m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}", 178 // m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}",
179 e.Source, e.Message); 179 // e.Source, e.Message);
180 } 180 //}
181 181
182 return new Dictionary<AssetType, InventoryFolderBase>(); 182 return new Dictionary<AssetType, InventoryFolderBase>();
183 } 183 }