OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* This was the cause of teleport tests interfering with each other
0.6.3-post-fixes
Justin Clarke Casey 2009-02-13 20:12:11 +00:00
parent d307109e1a
commit b71d68c9bc
4 changed files with 13 additions and 18 deletions
Show Stats 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 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); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected bool m_enabled = false; protected bool m_enabled = false;
@ -78,7 +78,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST
return; return;
InitEach(scene); InitEach(scene);
} }
public virtual void PostInitialise() public virtual void PostInitialise()
@ -162,7 +161,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST
//else //else
// m_log.Warn("[REST COMMS]: Region not found " + regionHandle); // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
return false; return false;
} }
public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData) public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData)
@ -180,7 +178,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST
//else //else
// m_log.Warn("[REST COMMS]: Region not found " + regionHandle); // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
return false; return false;
} }
public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri) 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] [Test]
public void TestMergeOarV0p2() public void TestMergeOarV0p2()
{ {
XmlConfigurator.Configure(); //XmlConfigurator.Configure();
MemoryStream archiveWriteStream = new MemoryStream(); MemoryStream archiveWriteStream = new MemoryStream();

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3750,7 +3750,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene); SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene);
if (jointProxyObject != null) if (jointProxyObject != null)
{ {
SimChat(Utils.StringToBytes("[NINJA] " + message), SimChat(Utils.StringToBytes("[NINJA]: " + message),
ChatTypeEnum.DebugChannel, ChatTypeEnum.DebugChannel,
2147483647, 2147483647,
jointProxyObject.AbsolutePosition, jointProxyObject.AbsolutePosition,
@ -3762,7 +3762,7 @@ namespace OpenSim.Region.Framework.Scenes
if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages) 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, ChatTypeEnum.DebugChannel,
2147483647, 2147483647,
jointProxyObject.AbsolutePosition, jointProxyObject.AbsolutePosition,

20
OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestSimpleNotNeighboursTeleport() public void TestSimpleNotNeighboursTeleport()
{ {
//log4net.Config.XmlConfigurator.Configure(); log4net.Config.XmlConfigurator.Configure();
UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100"); UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100");
UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200"); 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. // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
client.TeleportTargetScene = sceneB; 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(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(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. // Temporary assertion - caps url construction should at least be doable through a method.
//Assert.That( Assert.That(
// "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/",
// Is.EqualTo(client.CapsSeedUrl), Is.EqualTo(client.CapsSeedUrl),
// "Incorrect caps object path set up in sceneB"); "Incorrect caps object path set up in sceneB");
// ---- up to here -- Diva
// This assertion will currently fail since we don't remove the caps paths when no longer needed // 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"); //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");