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/Framework/Scenes/Tests/AttachmentTests.cs
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-9165a5207d81adfedeb07ed32eb095c0c42f086f.zip
opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.gz
opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.bz2
opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
index af44640..855b589 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
@@ -34,7 +34,6 @@ using System.Timers;
 using Timer=System.Timers.Timer;
 using Nini.Config;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
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/Framework/Scenes/Tests/AttachmentTests.cs
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-9165a5207d81adfedeb07ed32eb095c0c42f086f.zip opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.gz opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.bz2 opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs index af44640..855b589 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
@@ -34,7 +34,6 @@ using System.Timers;
34	using Timer=System.Timers.Timer;	34	using Timer=System.Timers.Timer;
35	using Nini.Config;	35	using Nini.Config;
36	using NUnit.Framework;	36	using NUnit.Framework;
37	using NUnit.Framework.SyntaxHelpers;
38	using OpenMetaverse;	37	using OpenMetaverse;
39	using OpenSim.Framework;	38	using OpenSim.Framework;
40	using OpenSim.Framework.Communications;	39	using OpenSim.Framework.Communications;