aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver
diff options
context:
space:
mode:
authorMelanie2011-03-10 07:14:03 +0000
committerMelanie2011-03-10 07:14:03 +0000
commit9165a5207d81adfedeb07ed32eb095c0c42f086f (patch)
tree839af9da6d5d56613312ad7b4fa2b1f9493a4842 /OpenSim/Region/CoreModules/World/Archiver
parentChange protection from being teleported home to extend to incognito gods. (diff)
parentChange existing users load iar test so that it fulfills it's original intenti... (diff)
downloadopensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.zip
opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.gz
opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.bz2
opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.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 04b6e3d..e2760a2 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -32,7 +32,6 @@ using System.Reflection;
32using System.Threading; 32using System.Threading;
33using log4net.Config; 33using log4net.Config;
34using NUnit.Framework; 34using NUnit.Framework;
35using NUnit.Framework.SyntaxHelpers;
36using OpenMetaverse; 35using OpenMetaverse;
37using OpenMetaverse.Assets; 36using OpenMetaverse.Assets;
38using OpenSim.Framework; 37using OpenSim.Framework;