From eca6442bae4093019bd221e87413c74c77c4ff5d Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 16 Jan 2009 21:56:13 +0000 Subject: * Rig up enough infrastructure to actually perform a successful 'standalone' teleport unit test with checks that the scene presence disappeared from sceneA and appeared in sceneB * However, I'm not convinced that the actual process in the test completely reflects reality, and a lot of stuff had to be rigged up (which should get resolved over time) --- .../Modules/Agent/TextureSender/Tests/TextureSenderTests.cs | 2 +- .../Modules/Communications/Local/LocalInterregionComms.cs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Environment/Modules') diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs index 42a4e91..cfac868 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs @@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender agent.InventoryFolder = UUID.Zero; agent.startpos = Vector3.Zero; agent.CapsPath = "http://wibble.com"; - client = new TestClient(agent); + client = new TestClient(agent, null); ts = new TextureSender(client, 0, 0); testsize = random.Next(5000,15000); npackets = CalculateNumPackets(testsize); diff --git a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs index 5fcb4bc..62f6df0 100644 --- a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs +++ b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs @@ -128,6 +128,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local return true; } } + // m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle); return false; } @@ -138,12 +139,16 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local { if (s.RegionInfo.RegionHandle == regionHandle) { - //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate"); + //m_log.DebugFormat( + // "[LOCAL COMMS]: Found region {0} {1} to send ChildAgentUpdate", + // s.RegionInfo.RegionName, regionHandle); + s.IncomingChildAgentDataUpdate(cAgentData); return true; } } - //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate"); + +// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for ChildAgentUpdate", regionHandle); return false; } -- cgit v1.1