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/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |
parent | * Fix http://opensimulator.org/mantis/view.php?id=3585 (diff) | |
download | opensim-SC_OLD-e0a06f641668cd5c25a7854af2faf8a61c4053ee.zip opensim-SC_OLD-e0a06f641668cd5c25a7854af2faf8a61c4053ee.tar.gz opensim-SC_OLD-e0a06f641668cd5c25a7854af2faf8a61c4053ee.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 9 |
1 files changed, 6 insertions, 3 deletions
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 | |||
115 | agent.startpos = Vector3.Zero; | 115 | agent.startpos = Vector3.Zero; |
116 | agent.CapsPath = GetRandomCapsObjectPath(); | 116 | agent.CapsPath = GetRandomCapsObjectPath(); |
117 | 117 | ||
118 | scene.NewUserConnection(agent); | 118 | string reason; |
119 | scene.NewUserConnection(agent, out reason); | ||
119 | testclient = new TestClient(agent, scene); | 120 | testclient = new TestClient(agent, scene); |
120 | scene.AddNewClient(testclient); | 121 | scene.AddNewClient(testclient); |
121 | 122 | ||
@@ -146,7 +147,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
146 | { | 147 | { |
147 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | 148 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); |
148 | 149 | ||
149 | scene.NewUserConnection(acd1); | 150 | string reason; |
151 | scene.NewUserConnection(acd1, out reason); | ||
150 | scene.AddNewClient(testclient); | 152 | scene.AddNewClient(testclient); |
151 | 153 | ||
152 | ScenePresence presence = scene.GetScenePresence(agent1); | 154 | ScenePresence presence = scene.GetScenePresence(agent1); |
@@ -203,7 +205,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
203 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | 205 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); |
204 | 206 | ||
205 | // Adding child agent to region 1001 | 207 | // Adding child agent to region 1001 |
206 | scene2.NewUserConnection(acd1); | 208 | string reason; |
209 | scene2.NewUserConnection(acd1, out reason); | ||
207 | scene2.AddNewClient(testclient); | 210 | scene2.AddNewClient(testclient); |
208 | 211 | ||
209 | ScenePresence presence = scene.GetScenePresence(agent1); | 212 | ScenePresence presence = scene.GetScenePresence(agent1); |