aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-02-18 23:25:59 +0000
committerJustin Clark-Casey (justincc)2011-02-18 23:25:59 +0000
commit8249d77991352697b4972f7109c014db0ebd5f68 (patch)
tree1ca71e15f18db4a2bc7e1a2204ae002e961b8306 /OpenSim/Region/Framework
parentminor: remove mono compiler warning (diff)
downloadopensim-SC_OLD-8249d77991352697b4972f7109c014db0ebd5f68.zip
opensim-SC_OLD-8249d77991352697b4972f7109c014db0ebd5f68.tar.gz
opensim-SC_OLD-8249d77991352697b4972f7109c014db0ebd5f68.tar.bz2
opensim-SC_OLD-8249d77991352697b4972f7109c014db0ebd5f68.tar.xz
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
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs7
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
201 public void TestChildAgentEstablished() 201 public void TestChildAgentEstablished()
202 { 202 {
203 TestHelper.InMethod(); 203 TestHelper.InMethod();
204 log4net.Config.XmlConfigurator.Configure(); 204// log4net.Config.XmlConfigurator.Configure();
205 205
206 UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001"); 206 UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
207 207
208 TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000); 208 TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
209 TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000); 209 TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);
210 210
211 IConfigSource configSource = new IniConfigSource();
212 configSource.AddConfig("Modules").Set("EntityTransferModule", "BasicEntityTransferModule");
211 EntityTransferModule etm = new EntityTransferModule(); 213 EntityTransferModule etm = new EntityTransferModule();
212 SceneSetupHelpers.SetupSceneModules(myScene1, etm); 214
215 SceneSetupHelpers.SetupSceneModules(myScene1, configSource, etm);
213 216
214 SceneSetupHelpers.AddRootAgent(myScene1, agent1Id); 217 SceneSetupHelpers.AddRootAgent(myScene1, agent1Id);
215 ScenePresence childPresence = myScene2.GetScenePresence(agent1); 218 ScenePresence childPresence = myScene2.GetScenePresence(agent1);