aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs45
1 files changed, 44 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 683fbfb..73cd061 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -1003,8 +1003,51 @@ namespace OpenSim.Region.Communications.OGS1
1003 //MainLog.Instance.Debug(e.ToString()); 1003 //MainLog.Instance.Debug(e.ToString());
1004 return false; 1004 return false;
1005 } 1005 }
1006 catch 1006
1007 catch (SocketException e)
1008 {
1009 MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region using tcp://" +
1010 regInfo.RemotingAddress +
1011 ":" + regInfo.RemotingPort +
1012 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY +
1013 " - Is this neighbor up?");
1014 MainLog.Instance.Debug(e.ToString());
1015 return false;
1016 }
1017 catch (InvalidCredentialException e)
1018 {
1019 MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region using tcp://" +
1020 regInfo.RemotingAddress +
1021 ":" + regInfo.RemotingPort +
1022 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
1023 MainLog.Instance.Debug(e.ToString());
1024 return false;
1025 }
1026 catch (AuthenticationException e)
1007 { 1027 {
1028 MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region using tcp://" +
1029 regInfo.RemotingAddress +
1030 ":" + regInfo.RemotingPort +
1031 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
1032 MainLog.Instance.Debug(e.ToString());
1033 return false;
1034 }
1035 catch (WebException e)
1036 {
1037 MainLog.Instance.Warn("WebException exception: Unable to connect to adjacent region using tcp://" +
1038 regInfo.RemotingAddress +
1039 ":" + regInfo.RemotingPort +
1040 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
1041 MainLog.Instance.Debug(e.ToString());
1042 return false;
1043 }
1044 catch (Exception e)
1045 {
1046 // This line errors with a Null Reference Exception.. Why? @.@
1047 //MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress +
1048 // ":" + regInfo.RemotingPort +
1049 //"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one");
1050 MainLog.Instance.Debug(e.ToString());
1008 return false; 1051 return false;
1009 } 1052 }
1010 } 1053 }