diff options
| author | Melanie | 2012-10-03 00:24:33 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-03 00:24:33 +0100 |
| commit | 23d5bafa7f5e7b23ea36300de8096c7dc84e51b0 (patch) | |
| tree | 044eb97d800f1ce82bfb0367488eb8752b3e6aa6 /OpenSim/Services | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.zip opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.gz opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.bz2 opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 988a9b9..cbb6e6c 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -300,7 +300,7 @@ namespace OpenSim.Services.LLLoginService | |||
| 300 | { | 300 | { |
| 301 | m_log.InfoFormat( | 301 | m_log.InfoFormat( |
| 302 | "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: user level is {2} but minimum login level is {3}", | 302 | "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: user level is {2} but minimum login level is {3}", |
| 303 | firstName, lastName, m_MinLoginLevel, account.UserLevel); | 303 | firstName, lastName, account.UserLevel, m_MinLoginLevel); |
| 304 | return LLFailedLoginResponse.LoginBlockedProblem; | 304 | return LLFailedLoginResponse.LoginBlockedProblem; |
| 305 | } | 305 | } |
| 306 | 306 | ||