aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2012-03-20 17:25:52 -0700
committerDiva Canto2012-03-20 17:25:52 -0700
commitf7c61790b7e88d6dd3ac2a226c77d5f43e1e6f05 (patch)
treecc1a16496bc70f259ba67f840d034a09efb331a0 /OpenSim
parentLine endings (diff)
downloadopensim-SC_OLD-f7c61790b7e88d6dd3ac2a226c77d5f43e1e6f05.zip
opensim-SC_OLD-f7c61790b7e88d6dd3ac2a226c77d5f43e1e6f05.tar.gz
opensim-SC_OLD-f7c61790b7e88d6dd3ac2a226c77d5f43e1e6f05.tar.bz2
opensim-SC_OLD-f7c61790b7e88d6dd3ac2a226c77d5f43e1e6f05.tar.xz
Fixed borkness with previous merge.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Util.cs17
1 files changed, 1 insertions, 16 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index ea1de80..deda62a 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2004,26 +2004,14 @@ namespace OpenSim.Framework
2004 // in the agent circuit data for foreigners 2004 // in the agent circuit data for foreigners
2005 if (lastName.Contains("@")) 2005 if (lastName.Contains("@"))
2006 { 2006 {
2007 string agentsURI = acircuit.ServiceURLs["HomeURI"].ToString();
2008 if (!agentsURI.EndsWith("/"))
2009 agentsURI += "/";
2010 string[] parts = firstName.Split(new char[] { '.' }); 2007 string[] parts = firstName.Split(new char[] { '.' });
2011 if (parts.Length == 2) 2008 if (parts.Length == 2)
2012 return id.ToString() + ";" + agentsURI + ";" + parts[0] + " " + parts[1]; 2009 return id.ToString() + ";" + agentsURI + ";" + parts[0] + " " + parts[1];
2013 } 2010 }
2014 return id.ToString() + ";" + agentsURI + ";" + firstName + " " + lastName; 2011 return id.ToString() + ";" + agentsURI + ";" + firstName + " " + lastName;
2015 2012
2016 } 2013 }
2017 2014
2018 // This is ugly, but there's no other way, given that the name is changed
2019 // in the agent circuit data for foreigners
2020 if (acircuit.lastname.Contains("@"))
2021 {
2022 string[] parts = acircuit.firstname.Split(new char[] { '.' });
2023 if (parts.Length == 2)
2024 return acircuit.AgentID.ToString() + ";" + agentsURI + ";" + parts[0] + " " + parts[1];
2025 }
2026 return acircuit.AgentID.ToString() + ";" + agentsURI + ";" + acircuit.firstname + " " + acircuit.lastname;
2027 /// <summary> 2015 /// <summary>
2028 /// Produces a universal (HG) user-facing name given the information 2016 /// Produces a universal (HG) user-facing name given the information
2029 /// </summary> 2017 /// </summary>
@@ -2038,9 +2026,6 @@ namespace OpenSim.Framework
2038 { 2026 {
2039 uri = new Uri(homeURI); 2027 uri = new Uri(homeURI);
2040 } 2028 }
2041 else
2042 return acircuit.AgentID.ToString();
2043 }
2044 catch (UriFormatException) 2029 catch (UriFormatException)
2045 { 2030 {
2046 return firstName + " " + lastName; 2031 return firstName + " " + lastName;