diff options
| author | Justin Clark-Casey (justincc) | 2012-03-09 00:20:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-09 00:20:10 +0000 |
| commit | df4b06aed13560e54e3aac4b719f3fbc6ea6fffe (patch) | |
| tree | 099e78dfbe9fd3c98629727320f2bda3d520c59b /OpenSim/Services | |
| parent | Merge branch 'xassetservice' (diff) | |
| parent | Fixes mantis #5923 (diff) | |
| download | opensim-SC_OLD-df4b06aed13560e54e3aac4b719f3fbc6ea6fffe.zip opensim-SC_OLD-df4b06aed13560e54e3aac4b719f3fbc6ea6fffe.tar.gz opensim-SC_OLD-df4b06aed13560e54e3aac4b719f3fbc6ea6fffe.tar.bz2 opensim-SC_OLD-df4b06aed13560e54e3aac4b719f3fbc6ea6fffe.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 0a59f86..4e38687 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
| @@ -296,9 +296,10 @@ namespace OpenSim.Services.HypergridService | |||
| 296 | aCircuit.firstname = account.FirstName; | 296 | aCircuit.firstname = account.FirstName; |
| 297 | aCircuit.lastname = account.LastName; | 297 | aCircuit.lastname = account.LastName; |
| 298 | } | 298 | } |
| 299 | if (account == null && !aCircuit.lastname.StartsWith("@")) | 299 | if (account == null) |
| 300 | { | 300 | { |
| 301 | aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname; | 301 | if (!aCircuit.lastname.StartsWith("@")) |
| 302 | aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname; | ||
| 302 | try | 303 | try |
| 303 | { | 304 | { |
| 304 | Uri uri = new Uri(aCircuit.ServiceURLs["HomeURI"].ToString()); | 305 | Uri uri = new Uri(aCircuit.ServiceURLs["HomeURI"].ToString()); |