aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs51
1 files changed, 36 insertions, 15 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 29f5472..f8ab9ef 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -865,40 +865,36 @@ namespace OpenSim.Region.Communications.OGS1
865 catch (RemotingException e) 865 catch (RemotingException e)
866 { 866 {
867 NoteDeadRegion(regionHandle); 867 NoteDeadRegion(regionHandle);
868 m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + 868 m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regionHandle);
869 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
870 m_log.Debug(e.ToString()); 869 m_log.Debug(e.ToString());
871 return false; 870 return false;
872 } 871 }
873 catch (SocketException e) 872 catch (SocketException e)
874 { 873 {
875 NoteDeadRegion(regionHandle); 874 NoteDeadRegion(regionHandle);
876 m_log.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + 875 m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regionHandle);
877 regInfo.RegionLocX + "," + regInfo.RegionLocY);
878 m_log.Debug(e.ToString()); 876 m_log.Debug(e.ToString());
879 return false; 877 return false;
880 } 878 }
881 catch (InvalidCredentialException e) 879 catch (InvalidCredentialException e)
882 { 880 {
883 NoteDeadRegion(regionHandle); 881 NoteDeadRegion(regionHandle);
884 m_log.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionName + 882 m_log.Warn("Invalid Credential Exception: Invalid Credentials : " + regionHandle);
885 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
886 m_log.Debug(e.ToString()); 883 m_log.Debug(e.ToString());
887 return false; 884 return false;
888 } 885 }
889 catch (AuthenticationException e) 886 catch (AuthenticationException e)
890 { 887 {
891 NoteDeadRegion(regionHandle); 888 NoteDeadRegion(regionHandle);
892 m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + 889 m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + regionHandle);
893 regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 890
894 m_log.Debug(e.ToString()); 891 m_log.Debug(e.ToString());
895 return false; 892 return false;
896 } 893 }
897 catch (Exception e) 894 catch (Exception e)
898 { 895 {
899 NoteDeadRegion(regionHandle); 896 NoteDeadRegion(regionHandle);
900 m_log.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionName + 897 m_log.Warn("Unknown exception: Unable to connect to adjacent region: " + regionHandle);
901 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
902 m_log.Debug(e.ToString()); 898 m_log.Debug(e.ToString());
903 return false; 899 return false;
904 } 900 }
@@ -1005,14 +1001,37 @@ namespace OpenSim.Region.Communications.OGS1
1005 catch (RemotingException e) 1001 catch (RemotingException e)
1006 { 1002 {
1007 NoteDeadRegion(regionHandle); 1003 NoteDeadRegion(regionHandle);
1008 m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + 1004 m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regionHandle);
1009 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
1010 m_log.Debug(e.ToString()); 1005 m_log.Debug(e.ToString());
1011 return false; 1006 return false;
1012 } 1007 }
1013 catch 1008 catch (SocketException e)
1014 { 1009 {
1015 NoteDeadRegion(regionHandle); 1010 NoteDeadRegion(regionHandle);
1011 m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regionHandle);
1012 m_log.Debug(e.ToString());
1013 return false;
1014 }
1015 catch (InvalidCredentialException e)
1016 {
1017 NoteDeadRegion(regionHandle);
1018 m_log.Warn("Invalid Credential Exception: Invalid Credentials : " + regionHandle);
1019 m_log.Debug(e.ToString());
1020 return false;
1021 }
1022 catch (AuthenticationException e)
1023 {
1024 NoteDeadRegion(regionHandle);
1025 m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + regionHandle);
1026
1027 m_log.Debug(e.ToString());
1028 return false;
1029 }
1030 catch (Exception e)
1031 {
1032 NoteDeadRegion(regionHandle);
1033 m_log.Warn("Unknown exception: Unable to connect to adjacent region: " + regionHandle);
1034 m_log.Debug(e.ToString());
1016 return false; 1035 return false;
1017 } 1036 }
1018 } 1037 }
@@ -1205,15 +1224,17 @@ namespace OpenSim.Region.Communications.OGS1
1205 // Is this necessary? 1224 // Is this necessary?
1206 try 1225 try
1207 { 1226 {
1208 //return m_localBackend.TriggerExpectPrim(regionHandle,primID, objData); 1227 m_localBackend.TriggerExpectPrim(regionHandle, primID, objData);
1228 return true;
1209 //m_localBackend. 1229 //m_localBackend.
1210 return false; 1230
1211 } 1231 }
1212 catch (RemotingException e) 1232 catch (RemotingException e)
1213 { 1233 {
1214 m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); 1234 m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
1215 return false; 1235 return false;
1216 } 1236 }
1237 return false;
1217 } 1238 }
1218 1239
1219 /// <summary> 1240 /// <summary>