From d0084f08f2d2d591706242227b2825a1e82e902e Mon Sep 17 00:00:00 2001 From: Arthur Valadares Date: Fri, 29 May 2009 22:38:18 +0000 Subject: * Allows standalone region users to skip the "You must wait 5 minutes to log again" message and allow the region to kick the old user and log the new one without reporting any failure. Default is still to show message and fail login --- OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'OpenSim/Client/Linden/LLStandaloneLoginModule.cs') diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index 6474feb..9cfa3c1 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs @@ -54,6 +54,7 @@ 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 @@ -78,9 +79,11 @@ 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) @@ -112,6 +115,7 @@ 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); -- cgit v1.1