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

StandAlone users. Not touching grid.

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
                         // try to tell the region that their user is dead.
                         LogOffUser(userProfile, " XMLRPC You were logged off because you logged in from another location");
 
-                        // Reject the login
-
                         if (m_warn_already_logged)
                         {
+                            // This is behavior for for grid, reject login
                             m_log.InfoFormat(
                                 "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in",
                                 firstname, lastname);
@@ -193,6 +192,7 @@ namespace OpenSim.Framework.Communications.Services
                         }
                         else
                         {
+                            // This is behavior for standalone (silent logout of last hung session)
                             m_log.InfoFormat(
                                 "[LOGIN]: User {0} {1} is already logged in, not notifying user, kicking old presence and starting new login.",
                                 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
 
         }
 
-        [Test]
+        // [Test]
+        // Commenting out test now that LLStandAloneLoginService no longer replies with message in this case.
+        // Kept the code for future test with grid mode, which will keep this behavior.
         public void T023_TestAuthenticatedLoginAlreadyLoggedIn()
         {
             TestHelper.InMethod();