From bc7ee7ba8806625012b916a30149e16ddba78ce6 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 9 Aug 2010 00:48:08 +0100
Subject: Remove "Could not authorize your session into the region" message in
 favor of sending back the actual error message provided by the sim.

---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs | 4 ----
 OpenSim/Services/LLLoginService/LLLoginService.cs  | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'OpenSim')

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
         protected string m_login;
 
         public static LLFailedLoginResponse UserProblem;
-        public static LLFailedLoginResponse AuthorizationProblem;
         public static LLFailedLoginResponse GridProblem;
         public static LLFailedLoginResponse InventoryProblem;
         public static LLFailedLoginResponse DeadRegionProblem;
@@ -65,9 +64,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 f942070..fead901 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -345,7 +345,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 
-- 
cgit v1.1