aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService/GridService.cs
diff options
context:
space:
mode:
authorDiva Canto2010-05-03 09:50:55 -0700
committerDiva Canto2010-05-03 09:50:55 -0700
commitb10811a13b8fab81ce00d544d8efe081792bdaaa (patch)
treed91da884fa1f43a11067f7adda2f398d3b9bf77a /OpenSim/Services/GridService/GridService.cs
parentFix a bug in owner change notification (diff)
downloadopensim-SC_OLD-b10811a13b8fab81ce00d544d8efe081792bdaaa.zip
opensim-SC_OLD-b10811a13b8fab81ce00d544d8efe081792bdaaa.tar.gz
opensim-SC_OLD-b10811a13b8fab81ce00d544d8efe081792bdaaa.tar.bz2
opensim-SC_OLD-b10811a13b8fab81ce00d544d8efe081792bdaaa.tar.xz
Assorted bug fixes in hypergrid linking.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/GridService/GridService.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 2faf018..4089fce 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -315,6 +315,8 @@ namespace OpenSim.Services.GridService
315 315
316 public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber) 316 public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
317 { 317 {
318 m_log.DebugFormat("[GRID SERVICE]: GetRegionsByName {0}", name);
319
318 List<RegionData> rdatas = m_Database.Get("%" + name + "%", scopeID); 320 List<RegionData> rdatas = m_Database.Get("%" + name + "%", scopeID);
319 321
320 int count = 0; 322 int count = 0;
@@ -329,7 +331,7 @@ namespace OpenSim.Services.GridService
329 } 331 }
330 } 332 }
331 333
332 if (m_AllowHypergridMapSearch && rdatas == null || (rdatas != null && rdatas.Count == 0) && name.Contains(".")) 334 if (m_AllowHypergridMapSearch && (rdatas == null || (rdatas != null && rdatas.Count == 0) && name.Contains(".")))
333 { 335 {
334 GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name); 336 GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name);
335 if (r != null) 337 if (r != null)
@@ -397,6 +399,7 @@ namespace OpenSim.Services.GridService
397 ret.Add(RegionData2RegionInfo(r)); 399 ret.Add(RegionData2RegionInfo(r));
398 } 400 }
399 401
402 m_log.DebugFormat("[GRID SERVICE]: GetDefaultRegions returning {0} regions", ret.Count);
400 return ret; 403 return ret;
401 } 404 }
402 405