diff options
author | Melanie | 2009-08-06 21:20:57 +0100 |
---|---|---|
committer | Melanie | 2009-08-06 21:20:57 +0100 |
commit | eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e (patch) | |
tree | a5b3d1ab68f5b9974cfed174c96f25cd710b542e /OpenSim/Region/CoreModules | |
parent | Add the addon modules folder (diff) | |
parent | goose panda (diff) | |
download | opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.zip opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.gz opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.bz2 opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.xz |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 14cee36..12d3e95 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
66 | /// <summary> | 66 | /// <summary> |
67 | /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). | 67 | /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). |
68 | /// </summary> | 68 | /// </summary> |
69 | [Test] | 69 | //[Test] |
70 | public void TestSaveIarV0_1() | 70 | public void TestSaveIarV0_1() |
71 | { | 71 | { |
72 | TestHelper.InMethod(); | 72 | TestHelper.InMethod(); |
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
202 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where | 202 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where |
203 | /// an account exists with the creator name. | 203 | /// an account exists with the creator name. |
204 | /// </summary> | 204 | /// </summary> |
205 | [Test] | 205 | //[Test] |
206 | public void TestLoadIarV0_1ExistingUsers() | 206 | public void TestLoadIarV0_1ExistingUsers() |
207 | { | 207 | { |
208 | TestHelper.InMethod(); | 208 | TestHelper.InMethod(); |
@@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
367 | CommunicationsManager commsManager = scene.CommsManager; | 367 | CommunicationsManager commsManager = scene.CommsManager; |
368 | 368 | ||
369 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); | 369 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); |
370 | userInfo.FetchInventory(); | 370 | //userInfo.FetchInventory(); |
371 | /* | 371 | /* |
372 | for (int i = 0 ; i < 50 ; i++) | 372 | for (int i = 0 ; i < 50 ; i++) |
373 | { | 373 | { |