From b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 13 Feb 2009 20:12:11 +0000
Subject: * Change static field "initialized" in RestInterregionComms to an
 instance field * This was the cause of teleport tests interfering with each
 other

---
 .../Region/CoreModules/Communications/REST/RESTInterregionComms.cs   | 5 +----
 OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs     | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

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();
 
-- 
cgit v1.1