diff options
| author | Melanie | 2009-12-29 18:41:45 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-29 18:41:45 +0000 |
| commit | 67cfac0cf15d873666d2bbf5e2178d4242d702b4 (patch) | |
| tree | ae27113d3b127d6eccaa189cc601f3b6ab714788 /OpenSim/Tests/Common/Setup | |
| parent | One should not copy/paste so much :) (diff) | |
| parent | Change teleports so the TeleportFlags are sent to the destination sim. It (diff) | |
| download | opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.zip opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.gz opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.bz2 opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Tests/Common/Setup')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 8b18d07..b13e8dd 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -382,7 +382,7 @@ namespace OpenSim.Tests.Common.Setup | |||
| 382 | 382 | ||
| 383 | // We emulate the proper login sequence here by doing things in three stages | 383 | // We emulate the proper login sequence here by doing things in three stages |
| 384 | // Stage 1: simulate login by telling the scene to expect a new user connection | 384 | // Stage 1: simulate login by telling the scene to expect a new user connection |
| 385 | scene.NewUserConnection(agentData, out reason); | 385 | scene.NewUserConnection(agentData, (uint)TeleportFlags.ViaLogin, out reason); |
| 386 | 386 | ||
| 387 | // Stage 2: add the new client as a child agent to the scene | 387 | // Stage 2: add the new client as a child agent to the scene |
| 388 | TestClient client = new TestClient(agentData, scene); | 388 | TestClient client = new TestClient(agentData, scene); |