diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index b91f4c2..16e5d93 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -607,31 +607,41 @@ namespace OpenSim.Region.Communications.OGS1 | |||
607 | } | 607 | } |
608 | catch (RemotingException e) | 608 | catch (RemotingException e) |
609 | { | 609 | { |
610 | MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 610 | MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + |
611 | ":" + regInfo.RemotingPort + | ||
612 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - Is this neighbor up?"); | ||
611 | MainLog.Instance.Debug(e.ToString()); | 613 | MainLog.Instance.Debug(e.ToString()); |
612 | return false; | 614 | return false; |
613 | } | 615 | } |
614 | catch (SocketException e) | 616 | catch (SocketException e) |
615 | { | 617 | { |
616 | MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 618 | MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + |
619 | ":" + regInfo.RemotingPort + | ||
620 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - Is this neighbor up?"); | ||
617 | MainLog.Instance.Debug(e.ToString()); | 621 | MainLog.Instance.Debug(e.ToString()); |
618 | return false; | 622 | return false; |
619 | } | 623 | } |
620 | catch (InvalidCredentialException e) | 624 | catch (InvalidCredentialException e) |
621 | { | 625 | { |
622 | MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 626 | MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + |
627 | ":" + regInfo.RemotingPort + | ||
628 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | ||
623 | MainLog.Instance.Debug(e.ToString()); | 629 | MainLog.Instance.Debug(e.ToString()); |
624 | return false; | 630 | return false; |
625 | } | 631 | } |
626 | catch (AuthenticationException e) | 632 | catch (AuthenticationException e) |
627 | { | 633 | { |
628 | MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region: " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 634 | MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + |
635 | ":" + regInfo.RemotingPort + | ||
636 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | ||
629 | MainLog.Instance.Debug(e.ToString()); | 637 | MainLog.Instance.Debug(e.ToString()); |
630 | return false; | 638 | return false; |
631 | } | 639 | } |
632 | catch (Exception e) | 640 | catch (Exception e) |
633 | { | 641 | { |
634 | MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 642 | MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + |
643 | ":" + regInfo.RemotingPort + | ||
644 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one"); | ||
635 | MainLog.Instance.Debug(e.ToString()); | 645 | MainLog.Instance.Debug(e.ToString()); |
636 | return false; | 646 | return false; |
637 | } | 647 | } |