diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs index 96d112d..0f386bc 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | |||
@@ -44,6 +44,7 @@ using OpenSim.Region.CoreModules.World.Serialiser; | |||
44 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; | 44 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; |
45 | using OpenSim.Tests.Common; | 45 | using OpenSim.Tests.Common; |
46 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 46 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
47 | using OpenSim.Services.Interfaces; | ||
47 | 48 | ||
48 | namespace OpenSim.Region.Framework.Scenes.Tests | 49 | namespace OpenSim.Region.Framework.Scenes.Tests |
49 | { | 50 | { |
@@ -141,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
141 | // Check rest of exepcted parameters. | 142 | // Check rest of exepcted parameters. |
142 | Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(spUuid), Is.Not.Null); | 143 | Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(spUuid), Is.Not.Null); |
143 | Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1)); | 144 | Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1)); |
144 | 145 | ||
145 | Assert.That(sp.IsChildAgent, Is.False); | 146 | Assert.That(sp.IsChildAgent, Is.False); |
146 | Assert.That(sp.UUID, Is.EqualTo(spUuid)); | 147 | Assert.That(sp.UUID, Is.EqualTo(spUuid)); |
147 | 148 | ||
@@ -226,7 +227,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
226 | // *** This is the first stage, when a neighbouring region is told that a viewer is about to try and | 227 | // *** This is the first stage, when a neighbouring region is told that a viewer is about to try and |
227 | // establish a child scene presence. We pass in the circuit code that the client has to connect with *** | 228 | // establish a child scene presence. We pass in the circuit code that the client has to connect with *** |
228 | // XXX: ViaLogin may not be correct here. | 229 | // XXX: ViaLogin may not be correct here. |
229 | scene.SimulationService.CreateAgent(null, region, acd, (uint)TeleportFlags.ViaLogin, out reason); | 230 | EntityTransferContext ctx = new EntityTransferContext(); |
231 | scene.SimulationService.CreateAgent(null, region, acd, (uint)TeleportFlags.ViaLogin, ctx, out reason); | ||
230 | 232 | ||
231 | Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(agentId), Is.Not.Null); | 233 | Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(agentId), Is.Not.Null); |
232 | Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1)); | 234 | Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1)); |
@@ -260,16 +262,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
260 | { | 262 | { |
261 | TestHelpers.InMethod(); | 263 | TestHelpers.InMethod(); |
262 | // log4net.Config.XmlConfigurator.Configure(); | 264 | // log4net.Config.XmlConfigurator.Configure(); |
263 | 265 | ||
264 | // UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 266 | // UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
265 | 267 | ||
266 | TestScene myScene1 = new SceneHelpers().SetupScene("Neighbour y", UUID.Random(), 1000, 1000); | 268 | TestScene myScene1 = new SceneHelpers().SetupScene("Neighbour y", UUID.Random(), 1000, 1000); |
267 | TestScene myScene2 = new SceneHelpers().SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000); | 269 | TestScene myScene2 = new SceneHelpers().SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000); |
268 | 270 | ||
269 | IConfigSource configSource = new IniConfigSource(); | 271 | IConfigSource configSource = new IniConfigSource(); |
270 | IConfig config = configSource.AddConfig("Startup"); | 272 | IConfig config = configSource.AddConfig("Startup"); |
271 | config.Set("serverside_object_permissions", true); | 273 | config.Set("serverside_object_permissions", true); |
272 | config.Set("EventQueue", true); | ||
273 | 274 | ||
274 | EntityTransferModule etm = new EntityTransferModule(); | 275 | EntityTransferModule etm = new EntityTransferModule(); |
275 | 276 | ||
@@ -278,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
278 | 279 | ||
279 | EventQueueGetModule eqgm2 = new EventQueueGetModule(); | 280 | EventQueueGetModule eqgm2 = new EventQueueGetModule(); |
280 | SceneHelpers.SetupSceneModules(myScene2, configSource, etm, eqgm2); | 281 | SceneHelpers.SetupSceneModules(myScene2, configSource, etm, eqgm2); |
281 | 282 | ||
282 | // SceneHelpers.AddScenePresence(myScene1, agent1Id); | 283 | // SceneHelpers.AddScenePresence(myScene1, agent1Id); |
283 | // ScenePresence childPresence = myScene2.GetScenePresence(agent1); | 284 | // ScenePresence childPresence = myScene2.GetScenePresence(agent1); |
284 | // | 285 | // |
@@ -287,4 +288,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
287 | // Assert.That(childPresence.IsChildAgent, Is.True); | 288 | // Assert.That(childPresence.IsChildAgent, Is.True); |
288 | } | 289 | } |
289 | } | 290 | } |
290 | } \ No newline at end of file | 291 | } |