diff options
| author | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
| commit | 2205d1c486666399085f2e6d3b7d5d08474587cf (patch) | |
| tree | 10fa1e3ed522d4eefdd3770a531648ee2c9957f4 /OpenSim/Tests | |
| parent | * Attempts to resolve the megaregion terrain edit rebound. (diff) | |
| parent | Fix an omission in LSL that causes a viewer crash (diff) | |
| download | opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.zip opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.gz opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.bz2 opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
| -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); |