From a85f1792df75eee93d22c1b98324b9205bea549a Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 2 Feb 2022 01:52:33 +0000 Subject: [PATCH] avid some spurius space on avatar uui --- OpenSim/Framework/Util.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 40fc826c22..52b84febb8 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -3707,11 +3707,12 @@ namespace OpenSim.Framework if (parts.Length >= 3) { - string[] name = parts[2].Split(); - if (name.Length == 2) + string[] name = parts[2].Split(new char[] {' ' },StringSplitOptions.RemoveEmptyEntries); + if(name.Length > 0) { firstname = name[0]; - lastname = name[1]; + if (name.Length > 1) + lastname = name[1]; } if (parts.Length >= 4) @@ -3875,10 +3876,10 @@ namespace OpenSim.Framework { string[] parts = firstName.Split(new char[] { '.' }); if (parts.Length == 2) - return CalcUniversalIdentifier(id, agentsURI, parts[0] + " " + parts[1]); + return CalcUniversalIdentifier(id, agentsURI, parts[0].Trim() + " " + parts[1].Trim()); } - return CalcUniversalIdentifier(id, agentsURI, firstName + " " + lastName); + return CalcUniversalIdentifier(id, agentsURI, firstName.Trim() + " " + lastName.Trim()); } private static string CalcUniversalIdentifier(UUID id, string agentsURI, string name) @@ -3902,9 +3903,9 @@ namespace OpenSim.Framework } catch (UriFormatException) { - return firstName + " " + lastName; + return firstName.Trim() + " " + lastName.Trim(); } - return firstName + "." + lastName + " " + "@" + uri.Authority; + return firstName.Trim() + "." + lastName.Trim() + " " + "@" + uri.Authority; } #endregion