Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-03-09 00:56:52 +00:00
6 changed files with 750 additions and 5 deletions

View File

@@ -296,9 +296,10 @@ namespace OpenSim.Services.HypergridService
aCircuit.firstname = account.FirstName;
aCircuit.lastname = account.LastName;
}
if (account == null && !aCircuit.lastname.StartsWith("@"))
if (account == null)
{
aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname;
if (!aCircuit.lastname.StartsWith("@"))
aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname;
try
{
Uri uri = new Uri(aCircuit.ServiceURLs["HomeURI"].ToString());