Add --merge switch to load iar.

When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
This commit is contained in:
Justin Clark-Casey (justincc)
2010-06-30 00:10:44 +01:00
parent be0af01061
commit 5925aac859
6 changed files with 170 additions and 91 deletions

View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*