aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-08-11 10:42:44 -0700
committerDiva Canto2009-08-11 10:42:44 -0700
commit263f32a493c0fff5f80e21ff269bbf8b456d3fa6 (patch)
treec0ceb6954a39b2d9efd156557c2d802276b20e84 /OpenSim
parentSystem folders inventory cache added to OUT inventory modules. This tracks ag... (diff)
downloadopensim-SC_OLD-263f32a493c0fff5f80e21ff269bbf8b456d3fa6.zip
opensim-SC_OLD-263f32a493c0fff5f80e21ff269bbf8b456d3fa6.tar.gz
opensim-SC_OLD-263f32a493c0fff5f80e21ff269bbf8b456d3fa6.tar.bz2
opensim-SC_OLD-263f32a493c0fff5f80e21ff269bbf8b456d3fa6.tar.xz
Improved test for system folders. Removed log messages.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs3
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs3
3 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 1562172..d4168fe 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -253,13 +253,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
253 if (content != null) 253 if (content != null)
254 { 254 {
255 Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>(); 255 Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>();
256 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: System folders count for {0}: {1}", userID, folders.Count);
257 foreach (InventoryFolderBase folder in content.Folders) 256 foreach (InventoryFolderBase folder in content.Folders)
258 { 257 {
259 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: scanning folder type {0}", (AssetType)folder.Type); 258 //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: scanning folder type {0}", (AssetType)folder.Type);
260 if (folder.Type != (short)AssetType.Folder) 259 if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
261 folders[(AssetType)folder.Type] = folder; 260 folders[(AssetType)folder.Type] = folder;
262 } 261 }
262 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: System folders count for {0}: {1}", userID, folders.Count);
263 return folders; 263 return folders;
264 } 264 }
265 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Root folder content not found for {0}", userID); 265 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Root folder content not found for {0}", userID);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 5c52897f..98e30ce 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -197,12 +197,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
197 Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>(); 197 Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>();
198 foreach (InventoryFolderBase folder in content.Folders) 198 foreach (InventoryFolderBase folder in content.Folders)
199 { 199 {
200 if (folder.Type != (short)AssetType.Folder) 200 if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
201 folders[(AssetType)folder.Type] = folder; 201 folders[(AssetType)folder.Type] = folder;
202 } 202 }
203 return folders; 203 return folders;
204 } 204 }
205 } 205 }
206 m_log.WarnFormat("[INVENTORY CONNECTOR]: System folders for {0} not found", userID);
206 return new Dictionary<AssetType, InventoryFolderBase>(); 207 return new Dictionary<AssetType, InventoryFolderBase>();
207 } 208 }
208 209
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index fc54c12..a9ecda4 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -284,12 +284,13 @@ namespace OpenSim.Services.InventoryService
284 Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>(); 284 Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>();
285 foreach (InventoryFolderBase folder in content.Folders) 285 foreach (InventoryFolderBase folder in content.Folders)
286 { 286 {
287 if (folder.Type != (short)AssetType.Folder) 287 if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
288 folders[(AssetType)folder.Type] = folder; 288 folders[(AssetType)folder.Type] = folder;
289 } 289 }
290 return folders; 290 return folders;
291 } 291 }
292 } 292 }
293 m_log.WarnFormat("[INVENTORY SERVICE]: System folders for {0} not found", userID);
293 return new Dictionary<AssetType, InventoryFolderBase>(); 294 return new Dictionary<AssetType, InventoryFolderBase>();
294 } 295 }
295 296