aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver
diff options
context:
space:
mode:
authorMelanie2011-05-22 20:23:25 +0100
committerMelanie2011-05-22 20:23:25 +0100
commitbe1996f1210ba58ba44f9715de68a3675cf13582 (patch)
tree7306bfe8a6e89bd1b2de9f145bea85f2b5645164 /OpenSim/Region/CoreModules/World/Archiver
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentAdd stubs for unimplemented lsl functions (diff)
downloadopensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.zip
opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.gz
opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.bz2
opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 729e9f7..2eb2861 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.Framework.Scenes;
43using OpenSim.Region.Framework.Scenes.Serialization; 43using OpenSim.Region.Framework.Scenes.Serialization;
44using OpenSim.Tests.Common; 44using OpenSim.Tests.Common;
45using OpenSim.Tests.Common.Mock; 45using OpenSim.Tests.Common.Mock;
46using OpenSim.Tests.Common.Setup;
47using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants; 46using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants;
48using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader; 47using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader;
49using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter; 48using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter;