diff options
| author | UbitUmarov | 2017-08-03 18:09:26 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-08-03 18:09:26 +0100 |
| commit | a4e7ab6fcfed3e40bf322010550671e480a363c9 (patch) | |
| tree | aaa90a4fe80a1080404212d295e68d4cfeee137b | |
| parent | add a few locks (diff) | |
| download | opensim-SC_OLD-a4e7ab6fcfed3e40bf322010550671e480a363c9.zip opensim-SC_OLD-a4e7ab6fcfed3e40bf322010550671e480a363c9.tar.gz opensim-SC_OLD-a4e7ab6fcfed3e40bf322010550671e480a363c9.tar.bz2 opensim-SC_OLD-a4e7ab6fcfed3e40bf322010550671e480a363c9.tar.xz | |
avoid a null ref
| -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."; |