Merge branch 'master' into careminster-presence-refactor

author: Melanie 2011-03-10 07:14:03 +0000
committer: Melanie 2011-03-10 07:14:03 +0000
commit: 9165a5207d81adfedeb07ed32eb095c0c42f086f (patch)
tree: 839af9da6d5d56613312ad7b4fa2b1f9493a4842 /OpenSim/Region/CoreModules/World/Archiver
parent: Change protection from being teleported home to extend to incognito gods. (diff)
parent: Change existing users load iar test so that it fulfills it's original intenti... (diff)
download: opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.zip
opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.gz
opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.bz2
opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.xz
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;
 using System.Threading;
 using log4net.Config;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenMetaverse.Assets;
 using OpenSim.Framework;
author	Melanie	2011-03-10 07:14:03 +0000
committer	Melanie	2011-03-10 07:14:03 +0000
commit	9165a5207d81adfedeb07ed32eb095c0c42f086f (patch)
tree	839af9da6d5d56613312ad7b4fa2b1f9493a4842 /OpenSim/Region/CoreModules/World/Archiver
parent	Change protection from being teleported home to extend to incognito gods. (diff)
parent	Change existing users load iar test so that it fulfills it's original intenti... (diff)
download	opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.zip opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.gz opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.bz2 opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.xz

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;
32	using System.Threading;	32	using System.Threading;
33	using log4net.Config;	33	using log4net.Config;
34	using NUnit.Framework;	34	using NUnit.Framework;
35	using NUnit.Framework.SyntaxHelpers;
36	using OpenMetaverse;	35	using OpenMetaverse;
37	using OpenMetaverse.Assets;	36	using OpenMetaverse.Assets;
38	using OpenSim.Framework;	37	using OpenSim.Framework;