diff --git a/LibreMetaverse.Types/UtilsConversions.cs b/LibreMetaverse.Types/UtilsConversions.cs index 2a3acf4c..b2f9c85f 100644 --- a/LibreMetaverse.Types/UtilsConversions.cs +++ b/LibreMetaverse.Types/UtilsConversions.cs @@ -654,7 +654,7 @@ namespace OpenMetaverse /// 0x7fffffff public static string UIntToHexString(uint i) { - return string.Format("{0:x8}", i); + return $"{i:x8}"; } /// @@ -680,7 +680,7 @@ namespace OpenMetaverse private static string GetString(byte[] bytes, int index, int count) { - string cnv = UTF8Encoding.UTF8.GetString(bytes, index, count); + string cnv = Encoding.UTF8.GetString(bytes, index, count); return InternStrings ? string.Intern(cnv) : cnv; } @@ -729,7 +729,7 @@ namespace OpenMetaverse if (j != 0) output.Append(' '); - output.Append(String.Format("{0:X2}", bytes[i + j])); + output.Append($"{bytes[i + j]:X2}"); } } } @@ -744,9 +744,9 @@ namespace OpenMetaverse /// A null-terminated UTF8 byte array public static byte[] StringToBytes(string str) { - if (String.IsNullOrEmpty(str)) { return EmptyBytes; } + if (string.IsNullOrEmpty(str)) { return EmptyBytes; } if (!str.EndsWith("\0")) { str += "\0"; } - return UTF8Encoding.UTF8.GetBytes(str); + return Encoding.UTF8.GetBytes(str); } /// @@ -801,14 +801,14 @@ namespace OpenMetaverse /// /// Character to test /// true if hex digit, false if not - private static bool IsHexDigit(Char c) + private static bool IsHexDigit(char c) { const int numA = 65; const int num0 = 48; int numChar; - c = Char.ToUpper(c); + c = char.ToUpper(c); numChar = Convert.ToInt32(c); if (numChar >= numA && numChar < (numA + 6)) diff --git a/Programs/examples/TestClient/Program.cs b/Programs/examples/TestClient/Program.cs index fbc00423..ceba5b25 100644 --- a/Programs/examples/TestClient/Program.cs +++ b/Programs/examples/TestClient/Program.cs @@ -22,6 +22,9 @@ namespace OpenMetaverse.TestClient static void Main(string[] args) { + Console.OutputEncoding = System.Text.Encoding.UTF8; + Console.InputEncoding = System.Text.Encoding.UTF8; + Arguments arguments = new Arguments(args); List accounts = new List();