Squelch red ink for login cancel by the user during circuit setup

OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

@@ -1118,7 +1118,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             SceneObjectGroup objatt;
 
-            UUID rezGroupID = sp.ControllingClient.ActiveGroupId;
+            UUID rezGroupID;
+
+            // This will fail if the user aborts login. sp will exist
+            // but ControllintClient will be null.
+            try
+            {
+                rezGroupID = sp.ControllingClient.ActiveGroupId;
+            }
+            catch
+            {
+                return null;
+            }
 
             if (itemID != UUID.Zero)
                 objatt = m_invAccessModule.RezObject(sp.ControllingClient,

OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

@@ -1999,8 +1999,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             IClientAPI spClient = sp.ControllingClient;
 
+            // This will fail if the user aborts login
+            try
+            {
                 if (!seeds.ContainsKey(currentRegionHandler))
                     seeds.Add(currentRegionHandler, spClient.RequestClientInfo().CapsPath);
+            }
+            catch
+            {
+                return;
+            }
 
             AgentCircuitData currentAgentCircuit =
                 spScene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);