diff options
| author | BlueWall | 2012-10-03 19:14:40 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-03 19:14:40 -0400 |
| commit | e6c9b0900615ac41d56f1fbd3ea30a6308b22f96 (patch) | |
| tree | 7cc9f82783ef8826a13e169a9d43ef9ec5d98cfc /OpenSim/Services | |
| parent | Add modular configuration for Robust connectors (diff) | |
| parent | Soliciting for comments on smoothness of physics objects for this build. (diff) | |
| download | opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.zip opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.gz opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.bz2 opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim into modular_config
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridUserService.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs index 8b738ab..2e7237e 100644 --- a/OpenSim/Services/Interfaces/IGridUserService.cs +++ b/OpenSim/Services/Interfaces/IGridUserService.cs | |||
| @@ -80,7 +80,7 @@ namespace OpenSim.Services.Interfaces | |||
| 80 | 80 | ||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | public Dictionary<string, object> ToKeyValuePairs() | 83 | public virtual Dictionary<string, object> ToKeyValuePairs() |
| 84 | { | 84 | { |
| 85 | Dictionary<string, object> result = new Dictionary<string, object>(); | 85 | Dictionary<string, object> result = new Dictionary<string, object>(); |
| 86 | result["UserID"] = UserID; | 86 | result["UserID"] = UserID; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 495dc52..59fb559 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -293,7 +293,7 @@ namespace OpenSim.Services.LLLoginService | |||
| 293 | { | 293 | { |
| 294 | m_log.InfoFormat( | 294 | m_log.InfoFormat( |
| 295 | "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: user level is {2} but minimum login level is {3}", | 295 | "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: user level is {2} but minimum login level is {3}", |
| 296 | firstName, lastName, m_MinLoginLevel, account.UserLevel); | 296 | firstName, lastName, account.UserLevel, m_MinLoginLevel); |
| 297 | return LLFailedLoginResponse.LoginBlockedProblem; | 297 | return LLFailedLoginResponse.LoginBlockedProblem; |
| 298 | } | 298 | } |
| 299 | 299 | ||