OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed borkness with previous merge.

0.7.4.1
Diva Canto 2012-03-20 17:25:52 -07:00
parent 841b4232f6
commit f7c61790b7
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/Util.cs
View File

@ -2004,26 +2004,14 @@ namespace OpenSim.Framework
// in the agent circuit data for foreigners // in the agent circuit data for foreigners
if (lastName.Contains("@")) if (lastName.Contains("@"))
{ {
string agentsURI = acircuit.ServiceURLs["HomeURI"].ToString();
if (!agentsURI.EndsWith("/"))
agentsURI += "/";
string[] parts = firstName.Split(new char[] { '.' }); string[] parts = firstName.Split(new char[] { '.' });
if (parts.Length == 2) if (parts.Length == 2)
return id.ToString() + ";" + agentsURI + ";" + parts[0] + " " + parts[1]; return id.ToString() + ";" + agentsURI + ";" + parts[0] + " " + parts[1];
} }
return id.ToString() + ";" + agentsURI + ";" + firstName + " " + lastName; return id.ToString() + ";" + agentsURI + ";" + firstName + " " + lastName;
} }
// This is ugly, but there's no other way, given that the name is changed
// in the agent circuit data for foreigners
if (acircuit.lastname.Contains("@"))
{
string[] parts = acircuit.firstname.Split(new char[] { '.' });
if (parts.Length == 2)
return acircuit.AgentID.ToString() + ";" + agentsURI + ";" + parts[0] + " " + parts[1];
}
return acircuit.AgentID.ToString() + ";" + agentsURI + ";" + acircuit.firstname + " " + acircuit.lastname;
/// <summary> /// <summary>
/// Produces a universal (HG) user-facing name given the information /// Produces a universal (HG) user-facing name given the information
/// </summary> /// </summary>
@ -2038,9 +2026,6 @@ namespace OpenSim.Framework
{ {
uri = new Uri(homeURI); uri = new Uri(homeURI);
} }
else
return acircuit.AgentID.ToString();
}
catch (UriFormatException) catch (UriFormatException)
{ {
return firstName + " " + lastName; return firstName + " " + lastName;