aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-08-11 17:10:22 +0100
committerJustin Clark-Casey (justincc)2009-08-11 17:10:22 +0100
commita52b5e46c04f35acbd241391956ad6454667e3fe (patch)
tree461a5fc51bd7bf55be5180f7924187cfc4674304
parentEnable the console show version command and the viewer about command, to show... (diff)
parentDisable test again. Ho hum. (diff)
downloadopensim-SC-a52b5e46c04f35acbd241391956ad6454667e3fe.zip
opensim-SC-a52b5e46c04f35acbd241391956ad6454667e3fe.tar.gz
opensim-SC-a52b5e46c04f35acbd241391956ad6454667e3fe.tar.bz2
opensim-SC-a52b5e46c04f35acbd241391956ad6454667e3fe.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index ffdda96..8ac9b1f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -379,7 +379,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
379 /// <summary> 379 /// <summary>
380 /// Test replication of an archive path to the user's inventory. 380 /// Test replication of an archive path to the user's inventory.
381 /// </summary> 381 /// </summary>
382 [Test] 382 //[Test]
383 public void TestReplicateArchivePathToUserInventory() 383 public void TestReplicateArchivePathToUserInventory()
384 { 384 {
385 TestHelper.InMethod(); 385 TestHelper.InMethod();