diff options
author | UbitUmarov | 2017-05-12 15:22:16 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-12 15:22:16 +0100 |
commit | d08df7bda71e1ad0b3001ac160ea5553fe7d7ad5 (patch) | |
tree | b06c42d1981f54c064db0f6d65ec18cfff3cb69f /OpenSim/Services/HypergridService | |
parent | fix a null ref on hg gatekeeper (diff) | |
download | opensim-SC_OLD-d08df7bda71e1ad0b3001ac160ea5553fe7d7ad5.zip opensim-SC_OLD-d08df7bda71e1ad0b3001ac160ea5553fe7d7ad5.tar.gz opensim-SC_OLD-d08df7bda71e1ad0b3001ac160ea5553fe7d7ad5.tar.bz2 opensim-SC_OLD-d08df7bda71e1ad0b3001ac160ea5553fe7d7ad5.tar.xz |
mantis 8165: fix a null ref on hg gatekeeper on another place
Diffstat (limited to 'OpenSim/Services/HypergridService')
-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 3e6b43a..8e3cf0e 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -376,7 +376,8 @@ namespace OpenSim.Services.HypergridService | |||
376 | return false; | 376 | return false; |
377 | } | 377 | } |
378 | 378 | ||
379 | if(aCircuit.AgentID == new UUID("6571e388-6218-4574-87db-f9379718315e")) | 379 | UUID agentID = aCircuit.AgentID; |
380 | if(agentID == new UUID("6571e388-6218-4574-87db-f9379718315e")) | ||
380 | { | 381 | { |
381 | // really? | 382 | // really? |
382 | reason = "Invalid account ID"; | 383 | reason = "Invalid account ID"; |
@@ -385,14 +386,14 @@ namespace OpenSim.Services.HypergridService | |||
385 | 386 | ||
386 | if(m_GridUserService != null) | 387 | if(m_GridUserService != null) |
387 | { | 388 | { |
388 | string PrincipalIDstr = account.PrincipalID.ToString(); | 389 | string PrincipalIDstr = agentID.ToString(); |
389 | GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(PrincipalIDstr); | 390 | GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(PrincipalIDstr); |
390 | 391 | ||
391 | if(!m_allowDuplicatePresences) | 392 | if(!m_allowDuplicatePresences) |
392 | { | 393 | { |
393 | if(guinfo != null && guinfo.Online && guinfo.LastRegionID != UUID.Zero) | 394 | if(guinfo != null && guinfo.Online && guinfo.LastRegionID != UUID.Zero) |
394 | { | 395 | { |
395 | if(SendAgentGodKillToRegion(UUID.Zero, account.PrincipalID, guinfo)) | 396 | if(SendAgentGodKillToRegion(UUID.Zero, agentID, guinfo)) |
396 | { | 397 | { |
397 | m_log.InfoFormat( | 398 | m_log.InfoFormat( |
398 | "[GATEKEEPER SERVICE]: Login failed for {0} {1}, reason: already logged in", | 399 | "[GATEKEEPER SERVICE]: Login failed for {0} {1}, reason: already logged in", |