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 | |
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
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 12 |
2 files changed, 22 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index f4a8a6b..8b8ac20 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -1118,7 +1118,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1118 | 1118 | ||
1119 | SceneObjectGroup objatt; | 1119 | SceneObjectGroup objatt; |
1120 | 1120 | ||
1121 | UUID rezGroupID = sp.ControllingClient.ActiveGroupId; | 1121 | UUID rezGroupID; |
1122 | |||
1123 | // This will fail if the user aborts login. sp will exist | ||
1124 | // but ControllintClient will be null. | ||
1125 | try | ||
1126 | { | ||
1127 | rezGroupID = sp.ControllingClient.ActiveGroupId; | ||
1128 | } | ||
1129 | catch | ||
1130 | { | ||
1131 | return null; | ||
1132 | } | ||
1122 | 1133 | ||
1123 | if (itemID != UUID.Zero) | 1134 | if (itemID != UUID.Zero) |
1124 | objatt = m_invAccessModule.RezObject(sp.ControllingClient, | 1135 | objatt = m_invAccessModule.RezObject(sp.ControllingClient, |
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); |