From eb330f71be3fd1dd6f3c82fb3ad60bfd8be7e894 Mon Sep 17 00:00:00 2001
From: Arthur Valadares
Date: Mon, 1 Jun 2009 18:34:40 +0000
Subject: * Making silent logoff of old hung sessions for new connections
 default for StandAlone users. Not touching grid.

---
 OpenSim/Client/Linden/LLStandaloneLoginModule.cs  |  4 ----
 OpenSim/Client/Linden/LLStandaloneLoginService.cs | 10 ++--------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Client')

diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index 9cfa3c1..6474feb 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -54,7 +54,6 @@ namespace OpenSim.Client.Linden
         protected bool m_enabled = false; // Module is only enabled if running in standalone mode
 
         protected bool authenticate;
-        protected bool m_warn_already_logged;
         protected string welcomeMessage;
 
         public bool RegionLoginsEnabled
@@ -79,11 +78,9 @@ namespace OpenSim.Client.Linden
         public void Initialise(IConfigSource source)
         {
             IConfig startupConfig = source.Configs["Startup"];
-            IConfig stdaloneConfig = source.Configs["StandAlone"];
             if (startupConfig != null)
             {
                 m_enabled = !startupConfig.GetBoolean("gridmode", false);
-                m_warn_already_logged = stdaloneConfig.GetBoolean("warn_user_already_logged_in", true);
             }
 
             if (m_enabled)
@@ -115,7 +112,6 @@ namespace OpenSim.Client.Linden
 
                     //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
                     m_loginService = new LLStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this);
-                    m_loginService.WarnAlreadyLogged = m_warn_already_logged;
 
                     httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
 
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
index d9af24d..6b217e6 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
@@ -52,14 +52,6 @@ namespace OpenSim.Client.Linden
         protected NetworkServersInfo m_serversInfo;
         protected bool m_authUsers = false;
 
-        // If true, warns the user that he is already logged, forcing another login.
-        // If false, skips message and logs in directly, kicking out current user.
-        public bool WarnAlreadyLogged
-        {
-            get { return m_warn_already_logged; }
-            set { m_warn_already_logged = value; }
-        }
-
         /// <summary>
         /// Used to make requests to the local regions.
         /// </summary>
@@ -79,6 +71,8 @@ namespace OpenSim.Client.Linden
 
             m_inventoryService = interServiceInventoryService;
             m_regionsConnector = regionsConnector;
+            // Standard behavior: In StandAlone, silent logout of last hung session
+            m_warn_already_logged = false;
         }
 
         public override UserProfileData GetTheUser(string firstname, string lastname)
-- 
cgit v1.1