Squelch red ink for login cancel by the user during circuit setup
parent
e81b3d8f0c
commit
ff945867a3
|
@ -1118,7 +1118,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
|
||||||
|
|
||||||
SceneObjectGroup objatt;
|
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)
|
if (itemID != UUID.Zero)
|
||||||
objatt = m_invAccessModule.RezObject(sp.ControllingClient,
|
objatt = m_invAccessModule.RezObject(sp.ControllingClient,
|
||||||
|
|
|
@ -1999,8 +1999,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
|
|
||||||
IClientAPI spClient = sp.ControllingClient;
|
IClientAPI spClient = sp.ControllingClient;
|
||||||
|
|
||||||
if (!seeds.ContainsKey(currentRegionHandler))
|
// This will fail if the user aborts login
|
||||||
seeds.Add(currentRegionHandler, spClient.RequestClientInfo().CapsPath);
|
try
|
||||||
|
{
|
||||||
|
if (!seeds.ContainsKey(currentRegionHandler))
|
||||||
|
seeds.Add(currentRegionHandler, spClient.RequestClientInfo().CapsPath);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
AgentCircuitData currentAgentCircuit =
|
AgentCircuitData currentAgentCircuit =
|
||||||
spScene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
|
spScene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
|
||||||
|
|
Loading…
Reference in New Issue