aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/Null/NullRegionData.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs11
-rw-r--r--OpenSim/Services/GridService/GridService.cs3
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs3
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs9
-rw-r--r--bin/config-include/GridCommon.ini.example1
6 files changed, 19 insertions, 12 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index 92db87a..dc68edb 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -133,12 +133,12 @@ namespace OpenSim.Data.Null
133 133
134 public List<RegionData> GetDefaultRegions(UUID scopeID) 134 public List<RegionData> GetDefaultRegions(UUID scopeID)
135 { 135 {
136 return null; 136 return new List<RegionData>();
137 } 137 }
138 138
139 public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y) 139 public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
140 { 140 {
141 return null; 141 return new List<RegionData>();
142 } 142 }
143 } 143 }
144} 144}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 391e7c8..61a8fff 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -188,7 +188,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
188 return rinfo; 188 return rinfo;
189 } 189 }
190 190
191 // Let's not override GetRegionsByName -- let's get them all from the grid server 191 public override List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
192 {
193 List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber);
194 List<GridRegion> grinfo = base.GetRegionsByName(scopeID, name, maxNumber);
195
196 if (grinfo != null)
197 rinfo.AddRange(grinfo);
198 return rinfo;
199 }
200
192 // Let's not override GetRegionRange -- let's get them all from the grid server 201 // Let's not override GetRegionRange -- let's get them all from the grid server
193 202
194 #endregion 203 #endregion
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
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index c0b635c..18d0586 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -470,7 +470,8 @@ namespace OpenSim.Services.GridService
470 string reason = string.Empty; 470 string reason = string.Empty;
471 if (TryLinkRegionToCoords(UUID.Zero, mapName, xloc, yloc, out reason) == null) 471 if (TryLinkRegionToCoords(UUID.Zero, mapName, xloc, yloc, out reason) == null)
472 MainConsole.Instance.Output("Failed to link region: " + reason); 472 MainConsole.Instance.Output("Failed to link region: " + reason);
473 MainConsole.Instance.Output("Hyperlink established"); 473 else
474 MainConsole.Instance.Output("Hyperlink established");
474 } 475 }
475 else 476 else
476 { 477 {
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 3bf0836..763e523 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Services.HypergridService
120 reason = string.Empty; 120 reason = string.Empty;
121 121
122 m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", regionName); 122 m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", regionName);
123 if (!m_AllowTeleportsToAnyRegion) 123 if (!m_AllowTeleportsToAnyRegion || regionName == string.Empty)
124 { 124 {
125 List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID); 125 List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID);
126 if (defs != null && defs.Count > 0) 126 if (defs != null && defs.Count > 0)
@@ -133,12 +133,7 @@ namespace OpenSim.Services.HypergridService
133 } 133 }
134 catch 134 catch
135 { 135 {
136 reason = "Grid setup problem"; 136 reason = "Grid setup problem. Try specifying a particular region here.";
137 return false;
138 }
139 if (regionName != string.Empty)
140 {
141 reason = "Direct links to regions not allowed";
142 return false; 137 return false;
143 } 138 }
144 139
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4d94ccd..a62868e 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -20,6 +20,7 @@
20 ; change this to your grid-wide grid server 20 ; change this to your grid-wide grid server
21 ; 21 ;
22 GridServerURI = "http://mygridserver.com:8003" 22 GridServerURI = "http://mygridserver.com:8003"
23 ;AllowHypergridMapSearch = true
23 24
24[AvatarService] 25[AvatarService]
25 ; 26 ;