aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Services
diff options
context:
space:
mode:
authorArthur Valadares2009-06-01 18:34:40 +0000
committerArthur Valadares2009-06-01 18:34:40 +0000
commiteb330f71be3fd1dd6f3c82fb3ad60bfd8be7e894 (patch)
tree1d47268a18d4d24230ffa65bca076fc00535d7eb /OpenSim/Framework/Communications/Services
parent* Add simple original sog xml serialization test (diff)
downloadopensim-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/Framework/Communications/Services')
-rw-r--r--OpenSim/Framework/Communications/Services/LoginService.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 36ec26e..900a3d9 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -181,10 +181,9 @@ namespace OpenSim.Framework.Communications.Services
181 // try to tell the region that their user is dead. 181 // try to tell the region that their user is dead.
182 LogOffUser(userProfile, " XMLRPC You were logged off because you logged in from another location"); 182 LogOffUser(userProfile, " XMLRPC You were logged off because you logged in from another location");
183 183
184 // Reject the login
185
186 if (m_warn_already_logged) 184 if (m_warn_already_logged)
187 { 185 {
186 // This is behavior for for grid, reject login
188 m_log.InfoFormat( 187 m_log.InfoFormat(
189 "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in", 188 "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in",
190 firstname, lastname); 189 firstname, lastname);
@@ -193,6 +192,7 @@ namespace OpenSim.Framework.Communications.Services
193 } 192 }
194 else 193 else
195 { 194 {
195 // This is behavior for standalone (silent logout of last hung session)
196 m_log.InfoFormat( 196 m_log.InfoFormat(
197 "[LOGIN]: User {0} {1} is already logged in, not notifying user, kicking old presence and starting new login.", 197 "[LOGIN]: User {0} {1} is already logged in, not notifying user, kicking old presence and starting new login.",
198 firstname, lastname); 198 firstname, lastname);