aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Tests
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-28 20:11:17 +0000
committerJustin Clarke Casey2008-11-28 20:11:17 +0000
commitdfbec673a4ca24ab683ea403361efa4372cc1e0d (patch)
tree4a561fa5ce77121f201008e6ea14ff5a0ba48fd4 /OpenSim/Region/Environment/Scenes/Tests
parent* Committing a new test, that will fail until someone decides to fix Location... (diff)
downloadopensim-SC_OLD-dfbec673a4ca24ab683ea403361efa4372cc1e0d.zip
opensim-SC_OLD-dfbec673a4ca24ab683ea403361efa4372cc1e0d.tar.gz
opensim-SC_OLD-dfbec673a4ca24ab683ea403361efa4372cc1e0d.tar.bz2
opensim-SC_OLD-dfbec673a4ca24ab683ea403361efa4372cc1e0d.tar.xz
* simplify AddNewClient since making this root without using MakeRootAgent() no longer sets everything up properly
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Tests')
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs9
2 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
index a16c26a..a19dbf7 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
62 agent.CapsPath = "http://wibble.com"; 62 agent.CapsPath = "http://wibble.com";
63 63
64 scene.NewUserConnection(agent); 64 scene.NewUserConnection(agent);
65 scene.AddNewClient(new TestClient(agent), false); 65 scene.AddNewClient(new TestClient(agent));
66 66
67 ScenePresence presence = scene.GetScenePresence(agentId); 67 ScenePresence presence = scene.GetScenePresence(agentId);
68 68
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
index 468a4ad..b169d9a 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
@@ -97,9 +97,16 @@ namespace OpenSim.Region.Environment.Scenes.Tests
97 agent.startpos = Vector3.Zero; 97 agent.startpos = Vector3.Zero;
98 agent.CapsPath = "http://wibble.com"; 98 agent.CapsPath = "http://wibble.com";
99 99
100 // We emulate the proper login sequence here by doing things in three stages
101 // Stage 1: simulate login by telling the scene to expect a new user connection
100 scene.NewUserConnection(agent); 102 scene.NewUserConnection(agent);
103
104 // Stage 2: add the new client as a child agent to the scene
101 IClientAPI client = new TestClient(agent); 105 IClientAPI client = new TestClient(agent);
102 scene.AddNewClient(client, true); 106 scene.AddNewClient(client);
107
108 // Stage 3: Invoke agent crossing, which converts the child agent into a root agent (with appearance,
109 // inventory, etc.)
103 scene.AgentCrossing(agent.AgentID, new Vector3(90, 90, 90), false); 110 scene.AgentCrossing(agent.AgentID, new Vector3(90, 90, 90), false);
104 111
105 return client; 112 return client;