diff options
author | Dr Scofield | 2009-05-05 16:17:52 +0000 |
---|---|---|
committer | Dr Scofield | 2009-05-05 16:17:52 +0000 |
commit | e0a06f641668cd5c25a7854af2faf8a61c4053ee (patch) | |
tree | c2a4620c4bdc0e479ca16528cd9e0524529a7998 /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |
parent | * Fix http://opensimulator.org/mantis/view.php?id=3585 (diff) | |
download | opensim-SC-e0a06f641668cd5c25a7854af2faf8a61c4053ee.zip opensim-SC-e0a06f641668cd5c25a7854af2faf8a61c4053ee.tar.gz opensim-SC-e0a06f641668cd5c25a7854af2faf8a61c4053ee.tar.bz2 opensim-SC-e0a06f641668cd5c25a7854af2faf8a61c4053ee.tar.xz |
- moving banned check and public/private check to
Scene.NewUserConnection()
- adding reason reporting
this enforces estate bans very early on and prevents us from
circulating client objects that we'd then have to retract once we
realize that the client is not allowed into the region
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index ea4f0af..8527886 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -245,9 +245,11 @@ namespace OpenSim.Tests.Common.Setup | |||
245 | /// <returns></returns> | 245 | /// <returns></returns> |
246 | public static TestClient AddRootAgent(Scene scene, AgentCircuitData agentData) | 246 | public static TestClient AddRootAgent(Scene scene, AgentCircuitData agentData) |
247 | { | 247 | { |
248 | string reason; | ||
249 | |||
248 | // We emulate the proper login sequence here by doing things in three stages | 250 | // We emulate the proper login sequence here by doing things in three stages |
249 | // Stage 1: simulate login by telling the scene to expect a new user connection | 251 | // Stage 1: simulate login by telling the scene to expect a new user connection |
250 | scene.NewUserConnection(agentData); | 252 | scene.NewUserConnection(agentData, out reason); |
251 | 253 | ||
252 | // Stage 2: add the new client as a child agent to the scene | 254 | // Stage 2: add the new client as a child agent to the scene |
253 | TestClient client = new TestClient(agentData, scene); | 255 | TestClient client = new TestClient(agentData, scene); |