diff options
| author | Melanie | 2012-08-29 03:31:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-29 03:31:13 +0100 |
| commit | 899337b4a0584ce2371c3bfcc44387d0f090b792 (patch) | |
| tree | 3a3e862951a85889c3c5762d6d30b5dd80868864 /OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | implementing rule tracking (diff) | |
| download | opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.zip opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.gz opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.bz2 opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs index b3a7c9e..87d9410 100644 --- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | |||
| @@ -199,7 +199,9 @@ namespace OpenSim.Tests.Common | |||
| 199 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); | 199 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); |
| 200 | 200 | ||
| 201 | InventoryFolderBase newFolder | 201 | InventoryFolderBase newFolder |
| 202 | = new InventoryFolderBase(UUID.Random(), components[0], parentFolder.Owner, parentFolder.ID); | 202 | = new InventoryFolderBase( |
| 203 | UUID.Random(), components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0); | ||
| 204 | |||
| 203 | inventoryService.AddFolder(newFolder); | 205 | inventoryService.AddFolder(newFolder); |
| 204 | 206 | ||
| 205 | if (components.Length > 1) | 207 | if (components.Length > 1) |