diff options
| author | teravus | 2012-11-15 10:05:16 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 10:05:16 -0500 |
| commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
| tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Services/LLLoginService/LLLoginService.cs | |
| parent | Merge master into teravuswork (diff) | |
| download | opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz | |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
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 cbb6e6c..988a9b9 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, account.UserLevel, m_MinLoginLevel); | 303 | firstName, lastName, m_MinLoginLevel, account.UserLevel); |
| 304 | return LLFailedLoginResponse.LoginBlockedProblem; | 304 | return LLFailedLoginResponse.LoginBlockedProblem; |
| 305 | } | 305 | } |
| 306 | 306 | ||