diff options
author | Arthur Valadares | 2009-06-01 18:34:40 +0000 |
---|---|---|
committer | Arthur Valadares | 2009-06-01 18:34:40 +0000 |
commit | eb330f71be3fd1dd6f3c82fb3ad60bfd8be7e894 (patch) | |
tree | 1d47268a18d4d24230ffa65bca076fc00535d7eb /OpenSim/Client/Linden/LLStandaloneLoginModule.cs | |
parent | * Add simple original sog xml serialization test (diff) | |
download | opensim-SC_OLD-eb330f71be3fd1dd6f3c82fb3ad60bfd8be7e894.zip opensim-SC_OLD-eb330f71be3fd1dd6f3c82fb3ad60bfd8be7e894.tar.gz opensim-SC_OLD-eb330f71be3fd1dd6f3c82fb3ad60bfd8be7e894.tar.bz2 opensim-SC_OLD-eb330f71be3fd1dd6f3c82fb3ad60bfd8be7e894.tar.xz |
* Making silent logoff of old hung sessions for new connections default for
StandAlone users. Not touching grid.
Diffstat (limited to 'OpenSim/Client/Linden/LLStandaloneLoginModule.cs')
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 4 |
1 files changed, 0 insertions, 4 deletions
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 | |||
54 | protected bool m_enabled = false; // Module is only enabled if running in standalone mode | 54 | protected bool m_enabled = false; // Module is only enabled if running in standalone mode |
55 | 55 | ||
56 | protected bool authenticate; | 56 | protected bool authenticate; |
57 | protected bool m_warn_already_logged; | ||
58 | protected string welcomeMessage; | 57 | protected string welcomeMessage; |
59 | 58 | ||
60 | public bool RegionLoginsEnabled | 59 | public bool RegionLoginsEnabled |
@@ -79,11 +78,9 @@ namespace OpenSim.Client.Linden | |||
79 | public void Initialise(IConfigSource source) | 78 | public void Initialise(IConfigSource source) |
80 | { | 79 | { |
81 | IConfig startupConfig = source.Configs["Startup"]; | 80 | IConfig startupConfig = source.Configs["Startup"]; |
82 | IConfig stdaloneConfig = source.Configs["StandAlone"]; | ||
83 | if (startupConfig != null) | 81 | if (startupConfig != null) |
84 | { | 82 | { |
85 | m_enabled = !startupConfig.GetBoolean("gridmode", false); | 83 | m_enabled = !startupConfig.GetBoolean("gridmode", false); |
86 | m_warn_already_logged = stdaloneConfig.GetBoolean("warn_user_already_logged_in", true); | ||
87 | } | 84 | } |
88 | 85 | ||
89 | if (m_enabled) | 86 | if (m_enabled) |
@@ -115,7 +112,6 @@ namespace OpenSim.Client.Linden | |||
115 | 112 | ||
116 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference | 113 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference |
117 | m_loginService = new LLStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); | 114 | m_loginService = new LLStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); |
118 | m_loginService.WarnAlreadyLogged = m_warn_already_logged; | ||
119 | 115 | ||
120 | httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); | 116 | httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); |
121 | 117 | ||