aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-12-09 08:28:21 -0800
committerDiva Canto2010-12-09 08:28:21 -0800
commitbaa8ddfd2640e5138e8f1287df17e07007d2a3ed (patch)
tree2648a47c55ea816e47ec0aa7f02e71f042819fc0
parentFixed wrong comment (diff)
downloadopensim-SC_OLD-baa8ddfd2640e5138e8f1287df17e07007d2a3ed.zip
opensim-SC_OLD-baa8ddfd2640e5138e8f1287df17e07007d2a3ed.tar.gz
opensim-SC_OLD-baa8ddfd2640e5138e8f1287df17e07007d2a3ed.tar.bz2
opensim-SC_OLD-baa8ddfd2640e5138e8f1287df17e07007d2a3ed.tar.xz
Minor bug fixes. Hunting down mantis #5259
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs4
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs2
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index d5d0195..2184498 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -215,7 +215,9 @@ namespace OpenSim.Services.GridService
215 215
216 public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason) 216 public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason)
217 { 217 {
218 m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, remoteRegionName, xloc, yloc); 218 m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}, in {2}-{3}",
219 ((serverURI == null) ? (externalHostName + ":" + externalPort) : serverURI),
220 remoteRegionName, xloc / Constants.RegionSize, yloc / Constants.RegionSize);
219 221
220 reason = string.Empty; 222 reason = string.Empty;
221 regInfo = new GridRegion(); 223 regInfo = new GridRegion();
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 3519250..12dda48 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Services.HypergridService
101 serverConfig = config.Configs["GatekeeperService"]; 101 serverConfig = config.Configs["GatekeeperService"];
102 m_GridName = serverConfig.GetString("ExternalName", string.Empty); 102 m_GridName = serverConfig.GetString("ExternalName", string.Empty);
103 } 103 }
104 else if (!m_GridName.EndsWith("/")) 104 if (!m_GridName.EndsWith("/"))
105 m_GridName = m_GridName + "/"; 105 m_GridName = m_GridName + "/";
106 } 106 }
107 } 107 }