diff options
author | Justin Clark-Casey (justincc) | 2012-08-29 02:01:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-08-29 02:01:43 +0100 |
commit | 7ea832d47c827ad9ef8eb0ce24702fbee585b1ee (patch) | |
tree | 9afe94690870999a66608b3b5cd51c4d068ec579 /OpenSim/Data | |
parent | Add experimental DynamicTextureModule.ReuseTextures flag, currently only conf... (diff) | |
download | opensim-SC-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.zip opensim-SC-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.tar.gz opensim-SC-7ea832d47c827ad9ef8eb0ce24702fbee585b1ee.tar.bz2 opensim-SC-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/Data')
-rw-r--r-- | OpenSim/Data/IXInventoryData.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs index 85a5c08..e64a828 100644 --- a/OpenSim/Data/IXInventoryData.cs +++ b/OpenSim/Data/IXInventoryData.cs | |||
@@ -40,6 +40,11 @@ namespace OpenSim.Data | |||
40 | public UUID folderID; | 40 | public UUID folderID; |
41 | public UUID agentID; | 41 | public UUID agentID; |
42 | public UUID parentFolderID; | 42 | public UUID parentFolderID; |
43 | |||
44 | public XInventoryFolder Clone() | ||
45 | { | ||
46 | return (XInventoryFolder)MemberwiseClone(); | ||
47 | } | ||
43 | } | 48 | } |
44 | 49 | ||
45 | public class XInventoryItem | 50 | public class XInventoryItem |
@@ -64,6 +69,11 @@ namespace OpenSim.Data | |||
64 | public UUID avatarID; | 69 | public UUID avatarID; |
65 | public UUID parentFolderID; | 70 | public UUID parentFolderID; |
66 | public int inventoryGroupPermissions; | 71 | public int inventoryGroupPermissions; |
72 | |||
73 | public XInventoryItem Clone() | ||
74 | { | ||
75 | return (XInventoryItem)MemberwiseClone(); | ||
76 | } | ||
67 | } | 77 | } |
68 | 78 | ||
69 | public interface IXInventoryData | 79 | public interface IXInventoryData |