diff options
| author | Melanie | 2010-05-10 03:57:44 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-10 03:57:44 +0100 |
| commit | 3e8ceb350972a1d00c4163fecd8172602cdcd865 (patch) | |
| tree | 9a23412c280440ff1762999c2d93fdd2685d0196 /OpenSim/Services/GridService/GridService.cs | |
| parent | Fix a null ref on region crossing (diff) | |
| parent | OK, this really fixes it, I promise. (diff) | |
| download | opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.zip opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.gz opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.bz2 opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 4089fce..7c98642 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
| @@ -324,6 +324,7 @@ namespace OpenSim.Services.GridService | |||
| 324 | 324 | ||
| 325 | if (rdatas != null) | 325 | if (rdatas != null) |
| 326 | { | 326 | { |
| 327 | m_log.DebugFormat("[GRID SERVICE]: Found {0} regions", rdatas.Count); | ||
| 327 | foreach (RegionData rdata in rdatas) | 328 | foreach (RegionData rdata in rdatas) |
| 328 | { | 329 | { |
| 329 | if (count++ < maxNumber) | 330 | if (count++ < maxNumber) |
| @@ -331,7 +332,7 @@ namespace OpenSim.Services.GridService | |||
| 331 | } | 332 | } |
| 332 | } | 333 | } |
| 333 | 334 | ||
| 334 | if (m_AllowHypergridMapSearch && (rdatas == null || (rdatas != null && rdatas.Count == 0) && name.Contains("."))) | 335 | if (m_AllowHypergridMapSearch && (rdatas == null || (rdatas != null && rdatas.Count == 0)) && name.Contains(".")) |
| 335 | { | 336 | { |
| 336 | GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name); | 337 | GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name); |
| 337 | if (r != null) | 338 | if (r != null) |