aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/InventoryService
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-29 02:01:43 +0100
committerJustin Clark-Casey (justincc)2012-08-29 02:01:43 +0100
commit7ea832d47c827ad9ef8eb0ce24702fbee585b1ee (patch)
tree9afe94690870999a66608b3b5cd51c4d068ec579 /OpenSim/Services/InventoryService
parentAdd experimental DynamicTextureModule.ReuseTextures flag, currently only conf... (diff)
downloadopensim-SC_OLD-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.zip
opensim-SC_OLD-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.tar.gz
opensim-SC_OLD-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.tar.bz2
opensim-SC_OLD-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.tar.xz
Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders.
This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
Diffstat (limited to 'OpenSim/Services/InventoryService')
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index deacd5a..309dab4 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Services.InventoryService
94 94
95 m_Database = LoadPlugin<IXInventoryData>(dllName, 95 m_Database = LoadPlugin<IXInventoryData>(dllName,
96 new Object[] {connString, String.Empty}); 96 new Object[] {connString, String.Empty});
97
97 if (m_Database == null) 98 if (m_Database == null)
98 throw new Exception("Could not find a storage interface in the given module"); 99 throw new Exception("Could not find a storage interface in the given module");
99 } 100 }
@@ -326,7 +327,7 @@ namespace OpenSim.Services.InventoryService
326 if (check != null) 327 if (check != null)
327 return false; 328 return false;
328 329
329 if (folder.Type != (short)AssetType.Folder || folder.Type != (short)AssetType.Unknown) 330 if (folder.Type != (short)AssetType.Folder && folder.Type != (short)AssetType.Unknown)
330 { 331 {
331 InventoryFolderBase rootFolder = GetRootFolder(folder.Owner); 332 InventoryFolderBase rootFolder = GetRootFolder(folder.Owner);
332 333