Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

3 files changed, 9 insertions, 9 deletions

diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Torture/NPCTortureTests.cs
index 627765b..731df68 100644
--- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs
+++ b/OpenSim/Tests/Torture/NPCTortureTests.cs
@@ -47,10 +47,10 @@ using OpenSim.Services.AvatarService;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
-namespace OpenSim.Tests.Performance
+namespace OpenSim.Tests.Torture
 {
     /// <summary>
-    /// NPC performance tests
+    /// NPC torture tests
     /// </summary>
     /// <remarks>
     /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
@@ -58,7 +58,7 @@ namespace OpenSim.Tests.Performance
     /// earlier tests.
     /// </remarks>
     [TestFixture]
-    public class NPCPerformanceTests
+    public class NPCTortureTests
     {
         private TestScene scene;
         private AvatarFactoryModule afm;
diff --git a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs b/OpenSim/Tests/Torture/ObjectTortureTests.cs
index 2264d86..195d47b 100644
--- a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs
+++ b/OpenSim/Tests/Torture/ObjectTortureTests.cs
@@ -36,10 +36,10 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
-namespace OpenSim.Tests.Performance
+namespace OpenSim.Tests.Torture
 {
     /// <summary>
-    /// Object performance tests
+    /// Object torture tests
     /// </summary>
     /// <remarks>
     /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
@@ -47,7 +47,7 @@ namespace OpenSim.Tests.Performance
     /// earlier tests.
     /// </remarks>
     [TestFixture]
-    public class ObjectPerformanceTests
+    public class ObjectTortureTests
     {
         [TearDown]
         public void TearDown()
diff --git a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs b/OpenSim/Tests/Torture/ScriptTortureTests.cs
index d708abd..24f278f 100644
--- a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs
+++ b/OpenSim/Tests/Torture/ScriptTortureTests.cs
@@ -42,10 +42,10 @@ using OpenSim.Region.ScriptEngine.XEngine;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
-namespace OpenSim.Tests.Performance
+namespace OpenSim.Tests.Torture
 {
     /// <summary>
-    /// Script performance tests
+    /// Script torture tests
     /// </summary>
     /// <remarks>
     /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
@@ -53,7 +53,7 @@ namespace OpenSim.Tests.Performance
     /// earlier tests.
     /// </remarks>
     [TestFixture]
-    public class ScriptPerformanceTests
+    public class ScriptTortureTests
     {
         private TestScene m_scene;
         private XEngine m_xEngine;