diff options
| author | Melanie Thielker | 2017-01-07 00:35:09 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-07 00:35:09 +0000 |
| commit | ff945867a3c986d7a226322d234c4002ee682263 (patch) | |
| tree | 6b0114417d273526fabff94742dceb0d62f9639e /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | Remove a red ink error on shutdown. Harmless message since shutting down anyway (diff) | |
| download | opensim-SC_OLD-ff945867a3c986d7a226322d234c4002ee682263.zip opensim-SC_OLD-ff945867a3c986d7a226322d234c4002ee682263.tar.gz opensim-SC_OLD-ff945867a3c986d7a226322d234c4002ee682263.tar.bz2 opensim-SC_OLD-ff945867a3c986d7a226322d234c4002ee682263.tar.xz | |
Squelch red ink for login cancel by the user during circuit setup
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index d0e5d86..6dc982b 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1999,8 +1999,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1999 | 1999 | ||
| 2000 | IClientAPI spClient = sp.ControllingClient; | 2000 | IClientAPI spClient = sp.ControllingClient; |
| 2001 | 2001 | ||
| 2002 | if (!seeds.ContainsKey(currentRegionHandler)) | 2002 | // This will fail if the user aborts login |
| 2003 | seeds.Add(currentRegionHandler, spClient.RequestClientInfo().CapsPath); | 2003 | try |
| 2004 | { | ||
| 2005 | if (!seeds.ContainsKey(currentRegionHandler)) | ||
| 2006 | seeds.Add(currentRegionHandler, spClient.RequestClientInfo().CapsPath); | ||
| 2007 | } | ||
| 2008 | catch | ||
| 2009 | { | ||
| 2010 | return; | ||
| 2011 | } | ||
| 2004 | 2012 | ||
| 2005 | AgentCircuitData currentAgentCircuit = | 2013 | AgentCircuitData currentAgentCircuit = |
| 2006 | spScene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); | 2014 | spScene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); |