aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService/GridService.cs
diff options
context:
space:
mode:
authorDiva Canto2010-01-31 22:35:23 -0800
committerDiva Canto2010-01-31 22:35:23 -0800
commit35a245b67a44eaa62dbf7951646ad9818caa8b02 (patch)
tree1b839dca4d1c391539ea67ffc7bdf7a9653d5cbe /OpenSim/Services/GridService/GridService.cs
parent* Remove unnecessary debug message (diff)
downloadopensim-SC_OLD-35a245b67a44eaa62dbf7951646ad9818caa8b02.zip
opensim-SC_OLD-35a245b67a44eaa62dbf7951646ad9818caa8b02.tar.gz
opensim-SC_OLD-35a245b67a44eaa62dbf7951646ad9818caa8b02.tar.bz2
opensim-SC_OLD-35a245b67a44eaa62dbf7951646ad9818caa8b02.tar.xz
Assorted bug fixes related to hyperlinking
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
-rw-r--r--OpenSim/Services/GridService/GridService.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 515d620..4dee7a4 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -329,7 +329,7 @@ namespace OpenSim.Services.GridService
329 } 329 }
330 } 330 }
331 331
332 if (m_AllowHypergridMapSearch && rdatas.Count == 0 && name.Contains(".")) 332 if (m_AllowHypergridMapSearch && rdatas == null || (rdatas != null && rdatas.Count == 0) && name.Contains("."))
333 { 333 {
334 GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name); 334 GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name);
335 if (r != null) 335 if (r != null)
@@ -412,6 +412,7 @@ namespace OpenSim.Services.GridService
412 ret.Add(RegionData2RegionInfo(r)); 412 ret.Add(RegionData2RegionInfo(r));
413 } 413 }
414 414
415 m_log.DebugFormat("[GRID SERVICE]: Fallback returned {0} regions", ret.Count);
415 return ret; 416 return ret;
416 } 417 }
417 418