* Added an army of exception handlers to the InterRegion logoff message
parent
3fe6b2280d
commit
f22b8b6f04
|
@ -1003,8 +1003,51 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
//MainLog.Instance.Debug(e.ToString());
|
//MainLog.Instance.Debug(e.ToString());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
catch
|
|
||||||
|
catch (SocketException e)
|
||||||
{
|
{
|
||||||
|
MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region using tcp://" +
|
||||||
|
regInfo.RemotingAddress +
|
||||||
|
":" + regInfo.RemotingPort +
|
||||||
|
"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY +
|
||||||
|
" - Is this neighbor up?");
|
||||||
|
MainLog.Instance.Debug(e.ToString());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
catch (InvalidCredentialException e)
|
||||||
|
{
|
||||||
|
MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region using tcp://" +
|
||||||
|
regInfo.RemotingAddress +
|
||||||
|
":" + regInfo.RemotingPort +
|
||||||
|
"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
|
||||||
|
MainLog.Instance.Debug(e.ToString());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
catch (AuthenticationException e)
|
||||||
|
{
|
||||||
|
MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region using tcp://" +
|
||||||
|
regInfo.RemotingAddress +
|
||||||
|
":" + regInfo.RemotingPort +
|
||||||
|
"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
|
||||||
|
MainLog.Instance.Debug(e.ToString());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
MainLog.Instance.Warn("WebException exception: Unable to connect to adjacent region using tcp://" +
|
||||||
|
regInfo.RemotingAddress +
|
||||||
|
":" + regInfo.RemotingPort +
|
||||||
|
"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
|
||||||
|
MainLog.Instance.Debug(e.ToString());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
// This line errors with a Null Reference Exception.. Why? @.@
|
||||||
|
//MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress +
|
||||||
|
// ":" + regInfo.RemotingPort +
|
||||||
|
//"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one");
|
||||||
|
MainLog.Instance.Debug(e.ToString());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue