* Change static field "initialized" in RestInterregionComms to an instance field

* This was the cause of teleport tests interfering with each other

4 files changed, 13 insertions, 18 deletions

diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index f533553..fcb3f5b 100644
--- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
 {
     public class RESTInterregionComms : IRegionModule, IInterregionCommsOut
     {
-        private static bool initialized = false;
+        private bool initialized = false;
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected bool m_enabled = false;
@@ -78,7 +78,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST
                 return;
 
             InitEach(scene);
-
         }
 
         public virtual void PostInitialise()
@@ -162,7 +161,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST
             //else
             //    m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
             return false;
-
         }
 
         public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData)
@@ -180,7 +178,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST
             //else
             //    m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
             return false;
-
         }
         
         public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 2fe96a2..c49a1f6 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         [Test]
         public void TestMergeOarV0p2()
         {
-            XmlConfigurator.Configure();
+            //XmlConfigurator.Configure();
             
             MemoryStream archiveWriteStream = new MemoryStream();
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 611b9db..c31e6f7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3750,7 +3750,7 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene);
                 if (jointProxyObject != null)
                 {
-                    SimChat(Utils.StringToBytes("[NINJA] " + message),
+                    SimChat(Utils.StringToBytes("[NINJA]: " + message),
                         ChatTypeEnum.DebugChannel,
                         2147483647,
                         jointProxyObject.AbsolutePosition,
@@ -3762,7 +3762,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages)
                     {
-                        SimChat(Utils.StringToBytes("[NINJA] Too many messages for this joint, suppressing further messages."),
+                        SimChat(Utils.StringToBytes("[NINJA]: Too many messages for this joint, suppressing further messages."),
                             ChatTypeEnum.DebugChannel,
                             2147483647,
                             jointProxyObject.AbsolutePosition,
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index e092334..64b3d67 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]        
         public void TestSimpleNotNeighboursTeleport()
         {
-            //log4net.Config.XmlConfigurator.Configure();
+            log4net.Config.XmlConfigurator.Configure();
             
             UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100");
             UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200");
@@ -80,20 +80,18 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                         
             // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
             client.TeleportTargetScene = sceneB;            
-            // Commenting this out for now -- Diva
-            //client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
+            client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
             
-            //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");                                   
-            //Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA");
+            Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");                                   
+            Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA");
             
-            //ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>();
+            ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>();
             
             // Temporary assertion - caps url construction should at least be doable through a method.
-            //Assert.That(
-            //    "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", 
-            //    Is.EqualTo(client.CapsSeedUrl), 
-            //    "Incorrect caps object path set up in sceneB");  
-            // ---- up to here -- Diva
+            Assert.That(
+                "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", 
+                Is.EqualTo(client.CapsSeedUrl), 
+                "Incorrect caps object path set up in sceneB");  
             
             // This assertion will currently fail since we don't remove the caps paths when no longer needed
             //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");