1 files changed, 89 insertions, 0 deletions
diff --git a/OpenSim.Framework/Util.cs b/OpenSim.Framework/Util.cs
index 695cac9..17ca611 100644
--- a/OpenSim.Framework/Util.cs
+++ b/OpenSim.Framework/Util.cs
@@ -36,6 +36,95 @@ namespace OpenSim.Framework.Utilities
            return id;
        }
+        public static int fast_distance2d(int x, int y)
+        {
+            x = System.Math.Abs(x);
+            y = System.Math.Abs(y);
+            int min = System.Math.Min(x, y);
+            return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
+        }
+        public static string FieldToString(byte[] bytes)
+        {
+            return FieldToString(bytes, String.Empty);
+        }
+        /// <summary>
+        /// Convert a variable length field (byte array) to a string, with a
+        /// field name prepended to each line of the output
+        /// </summary>
+        /// <remarks>If the byte array has unprintable characters in it, a 
+        /// hex dump will be put in the string instead</remarks>
+        /// <param name="bytes">The byte array to convert to a string</param>
+        /// <param name="fieldName">A field name to prepend to each line of output</param>
+        /// <returns>An ASCII string or a string containing a hex dump, minus 
+        /// the null terminator</returns>
+        public static string FieldToString(byte[] bytes, string fieldName)
+        {
+            // Check for a common case
+            if (bytes.Length == 0) return String.Empty;
+            StringBuilder output = new StringBuilder();
+            bool printable = true;
+            for (int i = 0; i < bytes.Length; ++i)
+            {
+                // Check if there are any unprintable characters in the array
+                if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09
+                    && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)
+                {
+                    printable = false;
+                    break;
+                }
+            }
+            if (printable)
+            {
+                if (fieldName.Length > 0)
+                {
+                    output.Append(fieldName);
+                    output.Append(": ");
+                }
+                if (bytes[bytes.Length - 1] == 0x00)
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));
+                else
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes));
+            }
+            else
+            {
+                for (int i = 0; i < bytes.Length; i += 16)
+                {
+                    if (i != 0)
+                        output.Append(Environment.NewLine);
+                    if (fieldName.Length > 0)
+                    {
+                        output.Append(fieldName);
+                        output.Append(": ");
+                    }
+                    for (int j = 0; j < 16; j++)
+                    {
+                        if ((i + j) < bytes.Length)
+                            output.Append(String.Format("{0:X2} ", bytes[i + j]));
+                        else
+                            output.Append("   ");
+                    }
+                    for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
+                    {
+                        if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
+                            output.Append((char)bytes[i + j]);
+                        else
+                            output.Append(".");
+                    }
+                }
+            }
+            return output.ToString();
+        }
        public Util()
        {

diff --git a/OpenSim.Framework/Util.cs b/OpenSim.Framework/Util.cs index 695cac9..17ca611 100644 --- a/OpenSim.Framework/Util.cs +++ b/OpenSim.Framework/Util.cs
@@ -36,6 +36,95 @@ namespace OpenSim.Framework.Utilities
36	return id;	36	return id;
37	}	37	}
38		38
		39	public static int fast_distance2d(int x, int y)
		40	{
		41	x = System.Math.Abs(x);
		42	y = System.Math.Abs(y);
		43
		44	int min = System.Math.Min(x, y);
		45
		46	return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
		47	}
		48
		49	public static string FieldToString(byte[] bytes)
		50	{
		51	return FieldToString(bytes, String.Empty);
		52	}
		53
		54	/// <summary>
		55	/// Convert a variable length field (byte array) to a string, with a
		56	/// field name prepended to each line of the output
		57	/// </summary>
		58	/// <remarks>If the byte array has unprintable characters in it, a
		59	/// hex dump will be put in the string instead</remarks>
		60	/// <param name="bytes">The byte array to convert to a string</param>
		61	/// <param name="fieldName">A field name to prepend to each line of output</param>
		62	/// <returns>An ASCII string or a string containing a hex dump, minus
		63	/// the null terminator</returns>
		64	public static string FieldToString(byte[] bytes, string fieldName)
		65	{
		66	// Check for a common case
		67	if (bytes.Length == 0) return String.Empty;
		68
		69	StringBuilder output = new StringBuilder();
		70	bool printable = true;
		71
		72	for (int i = 0; i < bytes.Length; ++i)
		73	{
		74	// Check if there are any unprintable characters in the array
		75	if ((bytes[i] < 0x20 \|\| bytes[i] > 0x7E) && bytes[i] != 0x09
		76	&& bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)
		77	{
		78	printable = false;
		79	break;
		80	}
		81	}
		82
		83	if (printable)
		84	{
		85	if (fieldName.Length > 0)
		86	{
		87	output.Append(fieldName);
		88	output.Append(": ");
		89	}
		90
		91	if (bytes[bytes.Length - 1] == 0x00)
		92	output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));
		93	else
		94	output.Append(UTF8Encoding.UTF8.GetString(bytes));
		95	}
		96	else
		97	{
		98	for (int i = 0; i < bytes.Length; i += 16)
		99	{
		100	if (i != 0)
		101	output.Append(Environment.NewLine);
		102	if (fieldName.Length > 0)
		103	{
		104	output.Append(fieldName);
		105	output.Append(": ");
		106	}
		107
		108	for (int j = 0; j < 16; j++)
		109	{
		110	if ((i + j) < bytes.Length)
		111	output.Append(String.Format("{0:X2} ", bytes[i + j]));
		112	else
		113	output.Append(" ");
		114	}
		115
		116	for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
		117	{
		118	if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
		119	output.Append((char)bytes[i + j]);
		120	else
		121	output.Append(".");
		122	}
		123	}
		124	}
		125
		126	return output.ToString();
		127	}
39	public Util()	128	public Util()
40	{	129	{
41		130