aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-08-15 17:25:27 -0700
committerDiva Canto2010-08-15 17:25:27 -0700
commitd5c24241b7bcbe22fe22e1b7b0057f1105070131 (patch)
tree72aa2b8eb513deb7faddfd7b56f92f5afe6eaac3
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-d5c24241b7bcbe22fe22e1b7b0057f1105070131.zip
opensim-SC_OLD-d5c24241b7bcbe22fe22e1b7b0057f1105070131.tar.gz
opensim-SC_OLD-d5c24241b7bcbe22fe22e1b7b0057f1105070131.tar.bz2
opensim-SC_OLD-d5c24241b7bcbe22fe22e1b7b0057f1105070131.tar.xz
Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG)
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 3aaafe8..6f041da 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -259,7 +259,16 @@ namespace OpenSim.Services.HypergridService
259 if (account == null && !aCircuit.lastname.StartsWith("@")) 259 if (account == null && !aCircuit.lastname.StartsWith("@"))
260 { 260 {
261 aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname; 261 aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname;
262 aCircuit.lastname = "@" + aCircuit.ServiceURLs["HomeURI"].ToString(); 262 try
263 {
264 Uri uri = new Uri(aCircuit.ServiceURLs["HomeURI"].ToString());
265 aCircuit.lastname = "@" + uri.Host; // + ":" + uri.Port;
266 }
267 catch
268 {
269 m_log.WarnFormat("[GATEKEEPER SERVICE]: Malformed HomeURI (this should never happen): {0}", aCircuit.ServiceURLs["HomeURI"]);
270 aCircuit.lastname = "@" + aCircuit.ServiceURLs["HomeURI"].ToString();
271 }
263 } 272 }
264 273
265 // 274 //