From e0a06f641668cd5c25a7854af2faf8a61c4053ee Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Tue, 5 May 2009 16:17:52 +0000 Subject: - 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 --- OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/Tests') diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index a26cb94..2903766 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs @@ -115,7 +115,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests agent.startpos = Vector3.Zero; agent.CapsPath = GetRandomCapsObjectPath(); - scene.NewUserConnection(agent); + string reason; + scene.NewUserConnection(agent, out reason); testclient = new TestClient(agent, scene); scene.AddNewClient(testclient); @@ -146,7 +147,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests { Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); - scene.NewUserConnection(acd1); + string reason; + scene.NewUserConnection(acd1, out reason); scene.AddNewClient(testclient); ScenePresence presence = scene.GetScenePresence(agent1); @@ -203,7 +205,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); // Adding child agent to region 1001 - scene2.NewUserConnection(acd1); + string reason; + scene2.NewUserConnection(acd1, out reason); scene2.AddNewClient(testclient); ScenePresence presence = scene.GetScenePresence(agent1); -- cgit v1.1