diff options
| author | UbitUmarov | 2017-08-16 05:05:57 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-08-16 05:05:57 +0100 |
| commit | 6d4b0a8ce3713eb45170f50b71d295ebaef0e51d (patch) | |
| tree | ba57d22e92ae6cadef8af599a2aa4f2a78057fce /OpenSim/Services | |
| parent | fix merge issues (diff) | |
| parent | Merge branch 'master' into BulletSim2017 (diff) | |
| download | opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.zip opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.gz opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.bz2 opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 8e3cf0e..5c6abd2 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
| @@ -395,9 +395,10 @@ namespace OpenSim.Services.HypergridService | |||
| 395 | { | 395 | { |
| 396 | if(SendAgentGodKillToRegion(UUID.Zero, agentID, guinfo)) | 396 | if(SendAgentGodKillToRegion(UUID.Zero, agentID, guinfo)) |
| 397 | { | 397 | { |
| 398 | m_log.InfoFormat( | 398 | if(account != null) |
| 399 | "[GATEKEEPER SERVICE]: Login failed for {0} {1}, reason: already logged in", | 399 | m_log.InfoFormat( |
| 400 | account.FirstName, account.LastName); | 400 | "[GATEKEEPER SERVICE]: Login failed for {0} {1}, reason: already logged in", |
| 401 | account.FirstName, account.LastName); | ||
| 401 | reason = "You appear to be already logged in on the destination grid " + | 402 | reason = "You appear to be already logged in on the destination grid " + |
| 402 | "Please wait a a minute or two and retry. " + | 403 | "Please wait a a minute or two and retry. " + |
| 403 | "If this takes longer than a few minutes please contact the grid owner."; | 404 | "If this takes longer than a few minutes please contact the grid owner."; |