diff options
author | Justin Clark-Casey (justincc) | 2013-02-16 00:49:06 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-02-16 00:50:52 +0000 |
commit | d54d31807af8b5e2b85897d0bb744d9d34055dff (patch) | |
tree | f26d20174d7ca1c31ee7a3b2e77754577aab1d4b /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-d54d31807af8b5e2b85897d0bb744d9d34055dff.zip opensim-SC_OLD-d54d31807af8b5e2b85897d0bb744d9d34055dff.tar.gz opensim-SC_OLD-d54d31807af8b5e2b85897d0bb744d9d34055dff.tar.bz2 opensim-SC_OLD-d54d31807af8b5e2b85897d0bb744d9d34055dff.tar.xz |
Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.
Really "My Inventory" is just the name of the root, it isn't a folder in its own right.
This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /*
/* will still work and this is a special case just for the root
If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/*
Added a regression test for this case.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index d703498..4ec8ae7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -272,6 +272,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
272 | saveFolderContentsOnly = true; | 272 | saveFolderContentsOnly = true; |
273 | maxComponentIndex--; | 273 | maxComponentIndex--; |
274 | } | 274 | } |
275 | else if (maxComponentIndex == -1) | ||
276 | { | ||
277 | // If the user has just specified "/", then don't save the root "My Inventory" folder. This is | ||
278 | // more intuitive then requiring the user to specify "/*" for this. | ||
279 | saveFolderContentsOnly = true; | ||
280 | } | ||
275 | 281 | ||
276 | m_invPath = String.Empty; | 282 | m_invPath = String.Empty; |
277 | for (int i = 0; i <= maxComponentIndex; i++) | 283 | for (int i = 0; i <= maxComponentIndex; i++) |