From 7f9d2de5f6effce70668e945ded18421ff03b1f4 Mon Sep 17 00:00:00 2001
From: Michael Cortez <mcortez@gmail.com>
Date: Mon, 14 Aug 2006 20:05:22 +0000
Subject: [PATCH] The mallet gets bigger' en' bigger...

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@158 52acb1d6-8a22-11de-b505-999d5b087335
---
 libsecondlife-cs/AssetSystem/Asset.cs                      | 2 +-
 libsecondlife-cs/{Utilities => Utils}/ImageTools.cs        | 2 +-
 libsecondlife-cs/{Utilities => Utils}/InventoryApp.cs      | 2 +-
 libsecondlife-cs/{Utilities => Utils}/Utils.cs             | 7 ++++---
 libsecondlife-cs/Utils/fubar.txt                           | 0
 libsecondlife-cs/examples/CreateNotecard/CreateNotecard.cs | 2 +-
 libsecondlife-cs/examples/ImageTool/ImageTool.cs           | 3 ++-
 libsecondlife-cs/examples/InventoryDump/InventoryDump.cs   | 2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)
 rename libsecondlife-cs/{Utilities => Utils}/ImageTools.cs (95%)
 rename libsecondlife-cs/{Utilities => Utils}/InventoryApp.cs (94%)
 rename libsecondlife-cs/{Utilities => Utils}/Utils.cs (85%)
 create mode 100644 libsecondlife-cs/Utils/fubar.txt

diff --git a/libsecondlife-cs/AssetSystem/Asset.cs b/libsecondlife-cs/AssetSystem/Asset.cs
index b88a8db2..789c1d89 100644
--- a/libsecondlife-cs/AssetSystem/Asset.cs
+++ b/libsecondlife-cs/AssetSystem/Asset.cs
@@ -48,7 +48,7 @@ namespace libsecondlife.AssetSystem
 
 		public string AssetDataToString()
 		{
-			return libsecondlife.Utils.ByteArrayToString((byte[])AssetData);
+			return libsecondlife.Utils.ByteArrayStuff.ByteArrayToString((byte[])AssetData);
 		}
 	}
 }
diff --git a/libsecondlife-cs/Utilities/ImageTools.cs b/libsecondlife-cs/Utils/ImageTools.cs
similarity index 95%
rename from libsecondlife-cs/Utilities/ImageTools.cs
rename to libsecondlife-cs/Utils/ImageTools.cs
index 4be4ea55..0b0218e0 100644
--- a/libsecondlife-cs/Utilities/ImageTools.cs
+++ b/libsecondlife-cs/Utils/ImageTools.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using System.Diagnostics;
 
-namespace libsecondlife
+namespace libsecondlife.Utils
 {
 	/// <summary>
 	/// Summary description for ImageTools.
diff --git a/libsecondlife-cs/Utilities/InventoryApp.cs b/libsecondlife-cs/Utils/InventoryApp.cs
similarity index 94%
rename from libsecondlife-cs/Utilities/InventoryApp.cs
rename to libsecondlife-cs/Utils/InventoryApp.cs
index 830ba4d7..dbb11de9 100644
--- a/libsecondlife-cs/Utilities/InventoryApp.cs
+++ b/libsecondlife-cs/Utils/InventoryApp.cs
@@ -4,7 +4,7 @@ using System.Collections;
 using libsecondlife;
 using libsecondlife.InventorySystem;
 
-namespace libsecondlife
+namespace libsecondlife.Utils
 {
 	/// <summary>
 	/// Summary description for InventoryApp.
diff --git a/libsecondlife-cs/Utilities/Utils.cs b/libsecondlife-cs/Utils/Utils.cs
similarity index 85%
rename from libsecondlife-cs/Utilities/Utils.cs
rename to libsecondlife-cs/Utils/Utils.cs
index 88dd1076..c50785b0 100644
--- a/libsecondlife-cs/Utilities/Utils.cs
+++ b/libsecondlife-cs/Utils/Utils.cs
@@ -1,14 +1,15 @@
 using System;
 
-namespace libsecondlife
+namespace libsecondlife.Utils
 {
 	/// <summary>
 	/// Summary description for Utils.
 	/// </summary>
-	public class Utils
+	public class ByteArrayStuff
 	{
-		private Utils()
+		private ByteArrayStuff()
 		{
+			// This class isn't intended to be instantiated
 		}
 
 		public static string ByteArrayToString( byte[] byteArray )
diff --git a/libsecondlife-cs/Utils/fubar.txt b/libsecondlife-cs/Utils/fubar.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/libsecondlife-cs/examples/CreateNotecard/CreateNotecard.cs b/libsecondlife-cs/examples/CreateNotecard/CreateNotecard.cs
index b7d8472e..ad67d6ad 100644
--- a/libsecondlife-cs/examples/CreateNotecard/CreateNotecard.cs
+++ b/libsecondlife-cs/examples/CreateNotecard/CreateNotecard.cs
@@ -11,7 +11,7 @@ namespace InventoryTools
 	/// <summary>
 	/// Summary description for Class1.
 	/// </summary>
-	class CreateNotecard : libsecondlife.InventoryApp
+	class CreateNotecard : libsecondlife.Utils.InventoryApp
 	{
 		/// <summary>
 		/// The main entry point for the application.
diff --git a/libsecondlife-cs/examples/ImageTool/ImageTool.cs b/libsecondlife-cs/examples/ImageTool/ImageTool.cs
index 23df0ea4..47c4baaa 100644
--- a/libsecondlife-cs/examples/ImageTool/ImageTool.cs
+++ b/libsecondlife-cs/examples/ImageTool/ImageTool.cs
@@ -5,13 +5,14 @@ using System.IO;
 using libsecondlife;
 using libsecondlife.InventorySystem;
 using libsecondlife.AssetSystem;
+using libsecondlife.Utils;
 
 namespace ImageTool
 {
 	/// <summary>
 	/// Summary description for Class1.
 	/// </summary>
-	class ImageTool : libsecondlife.InventoryApp
+	class ImageTool : libsecondlife.Utils.InventoryApp
 	{
 		private LLUUID _ImageID;
 		private string _FileName;
diff --git a/libsecondlife-cs/examples/InventoryDump/InventoryDump.cs b/libsecondlife-cs/examples/InventoryDump/InventoryDump.cs
index 60c296ce..3549243b 100644
--- a/libsecondlife-cs/examples/InventoryDump/InventoryDump.cs
+++ b/libsecondlife-cs/examples/InventoryDump/InventoryDump.cs
@@ -7,7 +7,7 @@ using libsecondlife.InventorySystem;
 
 namespace InventoryDump
 {
-	class InventoryDump : libsecondlife.InventoryApp
+	class InventoryDump : libsecondlife.Utils.InventoryApp
 	{
 		private string sOutputFile;
 		private bool   bOutputAssets;