If GridService.GetNeighbours() could not find the region then log a warning rather than causing a null reference on the normal log line

This also extends the TestChildAgentEstablished() test to actually activate the EntityTransferModule, though the test is not yet viable

1 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 60bc86c..5e1ff79 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -201,15 +201,18 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestChildAgentEstablished()
         {
             TestHelper.InMethod();
-            log4net.Config.XmlConfigurator.Configure();
+//            log4net.Config.XmlConfigurator.Configure();
             
             UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
             
             TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
             TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);            
             
+            IConfigSource configSource = new IniConfigSource();
+            configSource.AddConfig("Modules").Set("EntityTransferModule", "BasicEntityTransferModule");                      
             EntityTransferModule etm = new EntityTransferModule();
-            SceneSetupHelpers.SetupSceneModules(myScene1, etm);            
+            
+            SceneSetupHelpers.SetupSceneModules(myScene1, configSource, etm);            
             
             SceneSetupHelpers.AddRootAgent(myScene1, agent1Id);
             ScenePresence childPresence = myScene2.GetScenePresence(agent1);