diff options
| author | John Hurliman | 2009-10-06 12:15:24 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-06 12:15:24 -0700 |
| commit | fa6027aa09190ce50cfabcd3092836f21c99228c (patch) | |
| tree | e0ee78f308c1933f6d3aa9c6e80c2fcf4a75d6a2 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
| parent | * Added missing references to prebuild.xml and commented out the LindenUDP te... (diff) | |
| parent | * Removed verbose debug message (diff) | |
| download | opensim-SC_OLD-fa6027aa09190ce50cfabcd3092836f21c99228c.zip opensim-SC_OLD-fa6027aa09190ce50cfabcd3092836f21c99228c.tar.gz opensim-SC_OLD-fa6027aa09190ce50cfabcd3092836f21c99228c.tar.bz2 opensim-SC_OLD-fa6027aa09190ce50cfabcd3092836f21c99228c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs index 44e850b..6c89ac8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs | |||
| @@ -61,6 +61,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
| 61 | 61 | ||
| 62 | private void OnRegionUp(GridRegion otherRegion) | 62 | private void OnRegionUp(GridRegion otherRegion) |
| 63 | { | 63 | { |
| 64 | // This shouldn't happen | ||
| 65 | if (otherRegion == null) | ||
| 66 | return; | ||
| 67 | |||
| 64 | m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}", | 68 | m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}", |
| 65 | m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY); | 69 | m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY); |
| 66 | 70 | ||