diff options
| author | Melanie | 2009-12-30 22:24:14 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-30 22:24:14 +0000 |
| commit | a21ce9151b22c75117c4ea4d2a300c302ff78d6a (patch) | |
| tree | 8875cc8058a18645fa94ef055367046d23340e84 /OpenSim/Tests/Common/Setup | |
| parent | Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff) | |
| parent | * Fixes Sitting on the ground. (diff) | |
| download | opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.zip opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.gz opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.bz2 opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.xz | |
Merge branch 'master' into presence-refactor
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); |