diff options
author | Melanie | 2010-08-09 00:48:08 +0100 |
---|---|---|
committer | Melanie | 2010-08-09 00:48:08 +0100 |
commit | bc7ee7ba8806625012b916a30149e16ddba78ce6 (patch) | |
tree | b5d817b7337f5e40b47098766c96e1f79a93c19a | |
parent | Add distance sort for null, too (diff) | |
download | opensim-SC-bc7ee7ba8806625012b916a30149e16ddba78ce6.zip opensim-SC-bc7ee7ba8806625012b916a30149e16ddba78ce6.tar.gz opensim-SC-bc7ee7ba8806625012b916a30149e16ddba78ce6.tar.bz2 opensim-SC-bc7ee7ba8806625012b916a30149e16ddba78ce6.tar.xz |
Remove "Could not authorize your session into the region" message in favor
of sending back the actual error message provided by the sim.
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index a01ea1e..0da1715 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -52,7 +52,6 @@ namespace OpenSim.Services.LLLoginService | |||
52 | protected string m_login; | 52 | protected string m_login; |
53 | 53 | ||
54 | public static LLFailedLoginResponse UserProblem; | 54 | public static LLFailedLoginResponse UserProblem; |
55 | public static LLFailedLoginResponse AuthorizationProblem; | ||
56 | public static LLFailedLoginResponse GridProblem; | 55 | public static LLFailedLoginResponse GridProblem; |
57 | public static LLFailedLoginResponse InventoryProblem; | 56 | public static LLFailedLoginResponse InventoryProblem; |
58 | public static LLFailedLoginResponse DeadRegionProblem; | 57 | public static LLFailedLoginResponse DeadRegionProblem; |
@@ -65,9 +64,6 @@ namespace OpenSim.Services.LLLoginService | |||
65 | UserProblem = new LLFailedLoginResponse("key", | 64 | UserProblem = new LLFailedLoginResponse("key", |
66 | "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", | 65 | "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", |
67 | "false"); | 66 | "false"); |
68 | AuthorizationProblem = new LLFailedLoginResponse("key", | ||
69 | "Error connecting to grid. Unable to authorize your session into the region.", | ||
70 | "false"); | ||
71 | GridProblem = new LLFailedLoginResponse("key", | 67 | GridProblem = new LLFailedLoginResponse("key", |
72 | "Error connecting to the desired location. Try connecting to another region.", | 68 | "Error connecting to the desired location. Try connecting to another region.", |
73 | "false"); | 69 | "false"); |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index f942070..fead901 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -345,7 +345,7 @@ namespace OpenSim.Services.LLLoginService | |||
345 | { | 345 | { |
346 | m_PresenceService.LogoutAgent(session); | 346 | m_PresenceService.LogoutAgent(session); |
347 | m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: {0}", reason); | 347 | m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: {0}", reason); |
348 | return LLFailedLoginResponse.AuthorizationProblem; | 348 | return new LLFailedLoginResponse("key", reason, "false"); |
349 | 349 | ||
350 | } | 350 | } |
351 | // Get Friends list | 351 | // Get Friends list |