Merge branch 'master' into careminster-presence-refactor

2 files changed, 1 insertions, 5 deletions

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index c1da463..011cad8 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -52,7 +52,6 @@ namespace OpenSim.Services.LLLoginService
         protected string m_login;
 
         public static LLFailedLoginResponse UserProblem;
-        public static LLFailedLoginResponse AuthorizationProblem;
         public static LLFailedLoginResponse GridProblem;
         public static LLFailedLoginResponse InventoryProblem;
         public static LLFailedLoginResponse DeadRegionProblem;
@@ -66,9 +65,6 @@ namespace OpenSim.Services.LLLoginService
             UserProblem = new LLFailedLoginResponse("key", 
                 "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
                 "false");
-            AuthorizationProblem = new LLFailedLoginResponse("key",
-                "Error connecting to grid. Unable to authorize your session into the region.",
-                "false");
             GridProblem = new LLFailedLoginResponse("key",
                 "Error connecting to the desired location. Try connecting to another region.",
                 "false");
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index f9fe7f0..ddeb14f 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -351,7 +351,7 @@ namespace OpenSim.Services.LLLoginService
                 {
                     m_PresenceService.LogoutAgent(session);
                     m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: {0}", reason);
-                    return LLFailedLoginResponse.AuthorizationProblem;
+                    return new LLFailedLoginResponse("key", reason, "false");
 
                 }
                 // Get Friends list