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/Client/Linden/LLProxyLoginModule.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/Client/Linden/LLProxyLoginModule.cs')
-rw-r--r-- | OpenSim/Client/Linden/LLProxyLoginModule.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs index 67d5f4c..fd8c4dd 100644 --- a/OpenSim/Client/Linden/LLProxyLoginModule.cs +++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs | |||
@@ -208,21 +208,22 @@ namespace OpenSim.Client.Linden | |||
208 | { | 208 | { |
209 | denyMess = "User is banned from this region"; | 209 | denyMess = "User is banned from this region"; |
210 | m_log.InfoFormat( | 210 | m_log.InfoFormat( |
211 | "[CLIENT]: Denying access for user {0} {1} because user is banned", | 211 | "[CLIENT]: Denying access for user {0} {1} because user is banned", |
212 | agentData.firstname, agentData.lastname); | 212 | agentData.firstname, agentData.lastname); |
213 | } | 213 | } |
214 | else | 214 | else |
215 | { | 215 | { |
216 | if (scene.NewUserConnection(agentData)) | 216 | string reason; |
217 | if (scene.NewUserConnection(agentData, out reason)) | ||
217 | { | 218 | { |
218 | success = true; | 219 | success = true; |
219 | } | 220 | } |
220 | else | 221 | else |
221 | { | 222 | { |
222 | denyMess = "Login refused by region"; | 223 | denyMess = String.Format("Login refused by region: {0}", reason); |
223 | m_log.InfoFormat( | 224 | m_log.InfoFormat( |
224 | "[CLIENT]: Denying access for user {0} {1} because user connection was refused by the region", | 225 | "[CLIENT]: Denying access for user {0} {1} because user connection was refused by the region", |
225 | agentData.firstname, agentData.lastname); | 226 | agentData.firstname, agentData.lastname); |
226 | } | 227 | } |
227 | } | 228 | } |
228 | 229 | ||