aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Services/LoginService.cs4
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs4
2 files changed, 5 insertions, 3 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);
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 0cce2f0..7a622ad 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -304,7 +304,9 @@ namespace OpenSim.Framework.Communications.Tests
304 304
305 } 305 }
306 306
307 [Test] 307 // [Test]
308 // Commenting out test now that LLStandAloneLoginService no longer replies with message in this case.
309 // Kept the code for future test with grid mode, which will keep this behavior.
308 public void T023_TestAuthenticatedLoginAlreadyLoggedIn() 310 public void T023_TestAuthenticatedLoginAlreadyLoggedIn()
309 { 311 {
310 TestHelper.InMethod(); 312 TestHelper.InMethod();