* Allows standalone region users to skip the "You must wait 5 minutes to log again" message and

allow the region to kick the old user and log the new one without reporting any failure.
Default is still to show message and fail login

1 files changed, 15 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 2847887..34d24cb 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -61,6 +61,8 @@ namespace OpenSim.Framework.Communications.Services
         protected uint m_defaultHomeX;
         protected uint m_defaultHomeY;
 
+        protected bool m_warn_already_logged = true;
+
         /// <summary>
         /// Used by the login service to make requests to the inventory service.
         /// </summary>
@@ -181,11 +183,20 @@ namespace OpenSim.Framework.Communications.Services
 
                         // Reject the login
 
-                        m_log.InfoFormat(
-                            "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in",
-                            firstname, lastname);
+                        if (m_warn_already_logged)
+                        {
+                            m_log.InfoFormat(
+                                "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in",
+                                firstname, lastname);
 
-                        return logResponse.CreateAlreadyLoggedInResponse();
+                            return logResponse.CreateAlreadyLoggedInResponse();
+                        }
+                        else
+                        {
+                            m_log.InfoFormat(
+                                "[LOGIN]: User {0} {1} is already logged in, not notifying user, kicking old presence and starting new login.",
+                                firstname, lastname);
+                        }
                     }
 
                     // Otherwise...