From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.

---
 .../Framework/Scenes/Tests/ScenePresenceAgentTests.cs     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs')

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;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Tests.Common;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
@@ -141,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Check rest of exepcted parameters.
             Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(spUuid), Is.Not.Null);
             Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1));
-          
+
             Assert.That(sp.IsChildAgent, Is.False);
             Assert.That(sp.UUID, Is.EqualTo(spUuid));
 
@@ -226,7 +227,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // *** This is the first stage, when a neighbouring region is told that a viewer is about to try and
             // establish a child scene presence.  We pass in the circuit code that the client has to connect with ***
             // XXX: ViaLogin may not be correct here.
-            scene.SimulationService.CreateAgent(null, region, acd, (uint)TeleportFlags.ViaLogin, out reason);
+            EntityTransferContext ctx = new EntityTransferContext();
+            scene.SimulationService.CreateAgent(null, region, acd, (uint)TeleportFlags.ViaLogin, ctx, out reason);
 
             Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(agentId), Is.Not.Null);
             Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1));
@@ -260,16 +262,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
 //            UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
-            
+
             TestScene myScene1 = new SceneHelpers().SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
             TestScene myScene2 = new SceneHelpers().SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);
 
             IConfigSource configSource = new IniConfigSource();
             IConfig config = configSource.AddConfig("Startup");
             config.Set("serverside_object_permissions", true);
-            config.Set("EventQueue", true);
 
             EntityTransferModule etm = new EntityTransferModule();
 
@@ -278,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             EventQueueGetModule eqgm2 = new EventQueueGetModule();
             SceneHelpers.SetupSceneModules(myScene2, configSource, etm, eqgm2);
-            
+
 //            SceneHelpers.AddScenePresence(myScene1, agent1Id);
 //            ScenePresence childPresence = myScene2.GetScenePresence(agent1);
 //
@@ -287,4 +288,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            Assert.That(childPresence.IsChildAgent, Is.True);
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1