aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-02-18 23:05:56 +0000
committerJustin Clark-Casey (justincc)2011-02-18 23:05:56 +0000
commitdd9efc183812a66b1654aaeb419945cf57650b08 (patch)
treebd1f2b5911538759979fe80535274884cb051cd0 /OpenSim/Region
parentOn SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for... (diff)
downloadopensim-SC_OLD-dd9efc183812a66b1654aaeb419945cf57650b08.zip
opensim-SC_OLD-dd9efc183812a66b1654aaeb419945cf57650b08.tar.gz
opensim-SC_OLD-dd9efc183812a66b1654aaeb419945cf57650b08.tar.bz2
opensim-SC_OLD-dd9efc183812a66b1654aaeb419945cf57650b08.tar.xz
extend TestChildAgentEstablished() test slightly to put in EntityTransferModule. Not yet enabled.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs11
2 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b47ec3c..51b8dcc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1161,7 +1161,9 @@ namespace OpenSim.Region.Framework.Scenes
1161 if (m_agentTransfer != null) 1161 if (m_agentTransfer != null)
1162 m_agentTransfer.EnableChildAgents(this); 1162 m_agentTransfer.EnableChildAgents(this);
1163 else 1163 else
1164 m_log.DebugFormat("[SCENE PRESENCE]: Unable to create child agents in neighbours, because AgentTransferModule is not active"); 1164 m_log.DebugFormat(
1165 "[SCENE PRESENCE]: Unable to create child agents in neighbours, because AgentTransferModule is not active for region {0}",
1166 m_scene.RegionInfo.RegionName);
1165 1167
1166 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); 1168 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
1167 if (friendsModule != null) 1169 if (friendsModule != null)
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 92c73be..60bc86c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.CoreModules.Framework.EntityTransfer;
43using OpenSim.Region.CoreModules.World.Serialiser; 44using OpenSim.Region.CoreModules.World.Serialiser;
44using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; 45using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
45using OpenSim.Tests.Common; 46using OpenSim.Tests.Common;
@@ -199,10 +200,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests
199 [Test] 200 [Test]
200 public void TestChildAgentEstablished() 201 public void TestChildAgentEstablished()
201 { 202 {
203 TestHelper.InMethod();
204 log4net.Config.XmlConfigurator.Configure();
205
202 UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001"); 206 UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
203 207
204 TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); 208 TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
205 TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000); 209 TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);
210
211 EntityTransferModule etm = new EntityTransferModule();
212 SceneSetupHelpers.SetupSceneModules(myScene1, etm);
206 213
207 SceneSetupHelpers.AddRootAgent(myScene1, agent1Id); 214 SceneSetupHelpers.AddRootAgent(myScene1, agent1Id);
208 ScenePresence childPresence = myScene2.GetScenePresence(agent1); 215 ScenePresence childPresence = myScene2.GetScenePresence(agent1);