aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorArthur Valadares2009-05-29 22:38:18 +0000
committerArthur Valadares2009-05-29 22:38:18 +0000
commitd0084f08f2d2d591706242227b2825a1e82e902e (patch)
tree7a3b8ad159568ccf3fda09a25c52bbd92071ef89 /OpenSim/Framework
parent* Bug fix: Fixes an exception when Scene.RemoveClient is called to remove on a (diff)
downloadopensim-SC_OLD-d0084f08f2d2d591706242227b2825a1e82e902e.zip
opensim-SC_OLD-d0084f08f2d2d591706242227b2825a1e82e902e.tar.gz
opensim-SC_OLD-d0084f08f2d2d591706242227b2825a1e82e902e.tar.bz2
opensim-SC_OLD-d0084f08f2d2d591706242227b2825a1e82e902e.tar.xz
* 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
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Services/LoginService.cs19
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
61 protected uint m_defaultHomeX; 61 protected uint m_defaultHomeX;
62 protected uint m_defaultHomeY; 62 protected uint m_defaultHomeY;
63 63
64 protected bool m_warn_already_logged = true;
65
64 /// <summary> 66 /// <summary>
65 /// Used by the login service to make requests to the inventory service. 67 /// Used by the login service to make requests to the inventory service.
66 /// </summary> 68 /// </summary>
@@ -181,11 +183,20 @@ namespace OpenSim.Framework.Communications.Services
181 183
182 // Reject the login 184 // Reject the login
183 185
184 m_log.InfoFormat( 186 if (m_warn_already_logged)
185 "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in", 187 {
186 firstname, lastname); 188 m_log.InfoFormat(
189 "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in",
190 firstname, lastname);
187 191
188 return logResponse.CreateAlreadyLoggedInResponse(); 192 return logResponse.CreateAlreadyLoggedInResponse();
193 }
194 else
195 {
196 m_log.InfoFormat(
197 "[LOGIN]: User {0} {1} is already logged in, not notifying user, kicking old presence and starting new login.",
198 firstname, lastname);
199 }
189 } 200 }
190 201
191 // Otherwise... 202 // Otherwise...