ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* This was the cause of teleport tests interfering with each other
This commit is contained in:
Justin Clarke Casey
2009-02-13 20:12:11 +00:00
parent d307109e1a
commit b71d68c9bc
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
View File

@@ -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)

2
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
[Test]
public void TestMergeOarV0p2()
{
XmlConfigurator.Configure();
//XmlConfigurator.Configure();
MemoryStream archiveWriteStream = new MemoryStream();