aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-24 16:50:31 +0100
committerJustin Clark-Casey (justincc)2010-08-24 16:50:31 +0100
commit289c21099cf3ce0a2e3392436541b67d0961d8e8 (patch)
treec6f94eeb0c4f1fc98c2ddef7c855a97dc408c908 /OpenSim/Services
parentAdd system lookup folder fix to the RemoveXInventoryServiceConnector as well ... (diff)
downloadopensim-SC_OLD-289c21099cf3ce0a2e3392436541b67d0961d8e8.zip
opensim-SC_OLD-289c21099cf3ce0a2e3392436541b67d0961d8e8.tar.gz
opensim-SC_OLD-289c21099cf3ce0a2e3392436541b67d0961d8e8.tar.bz2
opensim-SC_OLD-289c21099cf3ce0a2e3392436541b67d0961d8e8.tar.xz
Add automated test at the opensim 'api' level to check that a given item goes to the correct directory
Also removes some mono compiler warnings
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index fbcd663..86bca79 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -268,15 +268,22 @@ namespace OpenSim.Services.InventoryService
268 268
269 public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) 269 public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
270 { 270 {
271// m_log.DebugFormat("[INVENTORY SERVICE]: Looking for folder type {0} for user {1}", type, userID);
272
271 InventoryFolderBase root = m_Database.getUserRootFolder(userID); 273 InventoryFolderBase root = m_Database.getUserRootFolder(userID);
272 if (root != null) 274 if (root != null)
273 { 275 {
274 List<InventoryFolderBase> folders = RequestSubFolders(root.ID); 276 List<InventoryFolderBase> folders = RequestSubFolders(root.ID);
275 277
276 foreach (InventoryFolderBase folder in folders) 278 foreach (InventoryFolderBase folder in folders)
277 { 279 {
278 if (folder.Type == (short)type) 280 if (folder.Type == (short)type)
281 {
282// m_log.DebugFormat(
283// "[INVENTORY SERVICE]: Found folder {0} type {1}", folder.Name, (AssetType)folder.Type);
284
279 return folder; 285 return folder;
286 }
280 } 287 }
281 } 288 }
282 289