diff options
author | Melanie Thielker | 2008-08-15 10:26:03 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-15 10:26:03 +0000 |
commit | 6717839d65cba890bfdaed5764c9cd48484483e5 (patch) | |
tree | 59205482ec6c7ddd915fe8df58e7c46513d964a4 /OpenSim | |
parent | Update svn properties, formatting cleanup, fix a couple compiler warnings. (diff) | |
download | opensim-SC_OLD-6717839d65cba890bfdaed5764c9cd48484483e5.zip opensim-SC_OLD-6717839d65cba890bfdaed5764c9cd48484483e5.tar.gz opensim-SC_OLD-6717839d65cba890bfdaed5764c9cd48484483e5.tar.bz2 opensim-SC_OLD-6717839d65cba890bfdaed5764c9cd48484483e5.tar.xz |
Fixes a case where neighboring region info cannot be obtained
and the region server tries to output the region information
using the unobtainable RegionInfo.
Caused a crash in GS1GridServices.cs, line 928
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 4f62d35..fe07275 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -925,9 +925,12 @@ namespace OpenSim.Region.Communications.OGS1 | |||
925 | { | 925 | { |
926 | NoteDeadRegion(regionHandle); | 926 | NoteDeadRegion(regionHandle); |
927 | 927 | ||
928 | m_log.WarnFormat( | 928 | if(regInfo != null) |
929 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 929 | { |
930 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 930 | m_log.WarnFormat( |
931 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | ||
932 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | ||
933 | } | ||
931 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); | 934 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
932 | 935 | ||
933 | return false; | 936 | return false; |