ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Making silent logoff of old hung sessions for new connections default for

Browse Source 
StandAlone users. Not touching grid.
This commit is contained in:
Arthur Valadares
2009-06-01 18:34:40 +00:00
parent 412295ccde
commit eb330f71be
5 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Client/Linden/LLStandaloneLoginModule.cs
View File

@@ -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);

10
OpenSim/Client/Linden/LLStandaloneLoginService.cs
View File

@@ -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)