diff options
| author | Justin Clark-Casey (justincc) | 2010-06-30 00:10:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-06-30 00:10:44 +0100 |
| commit | 5925aac859ee493fd7f6b10026c84a6a22626c79 (patch) | |
| tree | f7584dad5efc48c29ab51ef433a014900df98a29 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Revert "stop exceptions in setting and getting state from propogating since t... (diff) | |
| download | opensim-SC-5925aac859ee493fd7f6b10026c84a6a22626c79.zip opensim-SC-5925aac859ee493fd7f6b10026c84a6a22626c79.tar.gz opensim-SC-5925aac859ee493fd7f6b10026c84a6a22626c79.tar.bz2 opensim-SC-5925aac859ee493fd7f6b10026c84a6a22626c79.tar.xz | |
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
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs index fe71ed5..5ae6439 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
| 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
| 4 | * | 4 | * |