aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/GatekeeperService.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/HypergridService/GatekeeperService.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 '')
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs9
1 files changed, 2 insertions, 7 deletions
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