aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
diff options
context:
space:
mode:
authorMelanie2009-12-30 00:27:34 +0100
committerMelanie2009-12-30 00:27:34 +0100
commita08360e3cd06a266eef0030a3f04bab295a6e4ca (patch)
treea2af13489f9bc048a018e3ede3a05e0afb5e3f6a /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
parentFix a timer list locking issue causing XMREngine deadlocks (diff)
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
downloadopensim-SC-a08360e3cd06a266eef0030a3f04bab295a6e4ca.zip
opensim-SC-a08360e3cd06a266eef0030a3f04bab295a6e4ca.tar.gz
opensim-SC-a08360e3cd06a266eef0030a3f04bab295a6e4ca.tar.bz2
opensim-SC-a08360e3cd06a266eef0030a3f04bab295a6e4ca.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs2
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);