From ad102f3ea9a598b83e944a8f72e35d74a127be1d Mon Sep 17 00:00:00 2001
From: John Hurliman <jhurliman@jhurliman.org>
Date: Mon, 11 May 2009 19:28:50 +0000
Subject: [PATCH] Moving OpenMetaverseTypes library to its own folder. This
 will save a lot of prebuild headaches

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2744 52acb1d6-8a22-11de-b505-999d5b087335
---
 OpenMetaverse/Imaging/BakeLayer.cs            |  1 +
 OpenMetaverse/Messages/CableBeachMessages.cs  |  1 +
 .../BlockingQueue.cs                          |  0
 .../Types => OpenMetaverseTypes}/CRC32.cs     |  0
 .../CircularHashedQueue.cs                    |  0
 .../CircularQueue.cs                          |  0
 .../Types => OpenMetaverseTypes}/Color4.cs    |  0
 .../DoubleDictionary.cs                       |  0
 .../Types => OpenMetaverseTypes}/Enums.cs     | 35 +++++++++++++++++++
 .../ExpiringCache.cs                          |  0
 .../Types => OpenMetaverseTypes}/Matrix4.cs   |  0
 .../Quaternion.cs                             |  0
 .../Types => OpenMetaverseTypes}/Ray.cs       |  0
 .../ThreadSafeDictionary.cs                   |  0
 .../TokenBucket.cs                            |  0
 .../Types => OpenMetaverseTypes}/UUID.cs      |  0
 .../Types => OpenMetaverseTypes}/Utils.cs     |  0
 .../UtilsConversions.cs                       |  0
 .../Types => OpenMetaverseTypes}/Vector2.cs   |  0
 .../Types => OpenMetaverseTypes}/Vector3.cs   |  0
 .../Types => OpenMetaverseTypes}/Vector3d.cs  |  0
 .../Types => OpenMetaverseTypes}/Vector4.cs   |  0
 prebuild.xml                                  | 31 +++-------------
 23 files changed, 42 insertions(+), 26 deletions(-)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/BlockingQueue.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/CRC32.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/CircularHashedQueue.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/CircularQueue.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Color4.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/DoubleDictionary.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Enums.cs (83%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/ExpiringCache.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Matrix4.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Quaternion.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Ray.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/ThreadSafeDictionary.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/TokenBucket.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/UUID.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Utils.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/UtilsConversions.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Vector2.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Vector3.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Vector3d.cs (100%)
 rename {OpenMetaverse/Types => OpenMetaverseTypes}/Vector4.cs (100%)

diff --git a/OpenMetaverse/Imaging/BakeLayer.cs b/OpenMetaverse/Imaging/BakeLayer.cs
index c0ba8975..f38b6dc3 100644
--- a/OpenMetaverse/Imaging/BakeLayer.cs
+++ b/OpenMetaverse/Imaging/BakeLayer.cs
@@ -30,6 +30,7 @@ using System.IO;
 using System.Reflection;
 using System.Drawing;
 using System.Drawing.Imaging;
+using OpenMetaverse.Assets;
 
 namespace OpenMetaverse.Imaging
 {
diff --git a/OpenMetaverse/Messages/CableBeachMessages.cs b/OpenMetaverse/Messages/CableBeachMessages.cs
index 6cbbe2f6..0a09d0ab 100644
--- a/OpenMetaverse/Messages/CableBeachMessages.cs
+++ b/OpenMetaverse/Messages/CableBeachMessages.cs
@@ -35,6 +35,7 @@ namespace OpenMetaverse.Messages.CableBeach
     /// <summary>
     /// Holds information about a grid region
     /// </summary>
+    // TODO: Make this a class
     public struct RegionInfo
     {
         public string Name;
diff --git a/OpenMetaverse/Types/BlockingQueue.cs b/OpenMetaverseTypes/BlockingQueue.cs
similarity index 100%
rename from OpenMetaverse/Types/BlockingQueue.cs
rename to OpenMetaverseTypes/BlockingQueue.cs
diff --git a/OpenMetaverse/Types/CRC32.cs b/OpenMetaverseTypes/CRC32.cs
similarity index 100%
rename from OpenMetaverse/Types/CRC32.cs
rename to OpenMetaverseTypes/CRC32.cs
diff --git a/OpenMetaverse/Types/CircularHashedQueue.cs b/OpenMetaverseTypes/CircularHashedQueue.cs
similarity index 100%
rename from OpenMetaverse/Types/CircularHashedQueue.cs
rename to OpenMetaverseTypes/CircularHashedQueue.cs
diff --git a/OpenMetaverse/Types/CircularQueue.cs b/OpenMetaverseTypes/CircularQueue.cs
similarity index 100%
rename from OpenMetaverse/Types/CircularQueue.cs
rename to OpenMetaverseTypes/CircularQueue.cs
diff --git a/OpenMetaverse/Types/Color4.cs b/OpenMetaverseTypes/Color4.cs
similarity index 100%
rename from OpenMetaverse/Types/Color4.cs
rename to OpenMetaverseTypes/Color4.cs
diff --git a/OpenMetaverse/Types/DoubleDictionary.cs b/OpenMetaverseTypes/DoubleDictionary.cs
similarity index 100%
rename from OpenMetaverse/Types/DoubleDictionary.cs
rename to OpenMetaverseTypes/DoubleDictionary.cs
diff --git a/OpenMetaverse/Types/Enums.cs b/OpenMetaverseTypes/Enums.cs
similarity index 83%
rename from OpenMetaverse/Types/Enums.cs
rename to OpenMetaverseTypes/Enums.cs
index 272c43cd..e0de4a9e 100644
--- a/OpenMetaverse/Types/Enums.cs
+++ b/OpenMetaverseTypes/Enums.cs
@@ -162,4 +162,39 @@ namespace OpenMetaverse
         /// <summary>The contents of the object are for sale</summary>
         Contents = 3
     }
+
+    /// <summary>
+    /// Types of wearable assets
+    /// </summary>
+    public enum WearableType : byte
+    {
+        /// <summary>Body shape</summary>
+        Shape = 0,
+        /// <summary>Skin textures and attributes</summary>
+        Skin,
+        /// <summary>Hair</summary>
+        Hair,
+        /// <summary>Eyes</summary>
+        Eyes,
+        /// <summary>Shirt</summary>
+        Shirt,
+        /// <summary>Pants</summary>
+        Pants,
+        /// <summary>Shoes</summary>
+        Shoes,
+        /// <summary>Socks</summary>
+        Socks,
+        /// <summary>Jacket</summary>
+        Jacket,
+        /// <summary>Gloves</summary>
+        Gloves,
+        /// <summary>Undershirt</summary>
+        Undershirt,
+        /// <summary>Underpants</summary>
+        Underpants,
+        /// <summary>Skirt</summary>
+        Skirt,
+        /// <summary>Invalid wearable asset</summary>
+        Invalid = 255
+    };
 }
diff --git a/OpenMetaverse/Types/ExpiringCache.cs b/OpenMetaverseTypes/ExpiringCache.cs
similarity index 100%
rename from OpenMetaverse/Types/ExpiringCache.cs
rename to OpenMetaverseTypes/ExpiringCache.cs
diff --git a/OpenMetaverse/Types/Matrix4.cs b/OpenMetaverseTypes/Matrix4.cs
similarity index 100%
rename from OpenMetaverse/Types/Matrix4.cs
rename to OpenMetaverseTypes/Matrix4.cs
diff --git a/OpenMetaverse/Types/Quaternion.cs b/OpenMetaverseTypes/Quaternion.cs
similarity index 100%
rename from OpenMetaverse/Types/Quaternion.cs
rename to OpenMetaverseTypes/Quaternion.cs
diff --git a/OpenMetaverse/Types/Ray.cs b/OpenMetaverseTypes/Ray.cs
similarity index 100%
rename from OpenMetaverse/Types/Ray.cs
rename to OpenMetaverseTypes/Ray.cs
diff --git a/OpenMetaverse/Types/ThreadSafeDictionary.cs b/OpenMetaverseTypes/ThreadSafeDictionary.cs
similarity index 100%
rename from OpenMetaverse/Types/ThreadSafeDictionary.cs
rename to OpenMetaverseTypes/ThreadSafeDictionary.cs
diff --git a/OpenMetaverse/Types/TokenBucket.cs b/OpenMetaverseTypes/TokenBucket.cs
similarity index 100%
rename from OpenMetaverse/Types/TokenBucket.cs
rename to OpenMetaverseTypes/TokenBucket.cs
diff --git a/OpenMetaverse/Types/UUID.cs b/OpenMetaverseTypes/UUID.cs
similarity index 100%
rename from OpenMetaverse/Types/UUID.cs
rename to OpenMetaverseTypes/UUID.cs
diff --git a/OpenMetaverse/Types/Utils.cs b/OpenMetaverseTypes/Utils.cs
similarity index 100%
rename from OpenMetaverse/Types/Utils.cs
rename to OpenMetaverseTypes/Utils.cs
diff --git a/OpenMetaverse/Types/UtilsConversions.cs b/OpenMetaverseTypes/UtilsConversions.cs
similarity index 100%
rename from OpenMetaverse/Types/UtilsConversions.cs
rename to OpenMetaverseTypes/UtilsConversions.cs
diff --git a/OpenMetaverse/Types/Vector2.cs b/OpenMetaverseTypes/Vector2.cs
similarity index 100%
rename from OpenMetaverse/Types/Vector2.cs
rename to OpenMetaverseTypes/Vector2.cs
diff --git a/OpenMetaverse/Types/Vector3.cs b/OpenMetaverseTypes/Vector3.cs
similarity index 100%
rename from OpenMetaverse/Types/Vector3.cs
rename to OpenMetaverseTypes/Vector3.cs
diff --git a/OpenMetaverse/Types/Vector3d.cs b/OpenMetaverseTypes/Vector3d.cs
similarity index 100%
rename from OpenMetaverse/Types/Vector3d.cs
rename to OpenMetaverseTypes/Vector3d.cs
diff --git a/OpenMetaverse/Types/Vector4.cs b/OpenMetaverseTypes/Vector4.cs
similarity index 100%
rename from OpenMetaverse/Types/Vector4.cs
rename to OpenMetaverseTypes/Vector4.cs
diff --git a/prebuild.xml b/prebuild.xml
index 04bb4ffd..891147cd 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -56,20 +56,20 @@
 
     <!-- Libraries -->
     
-    <Project name="OpenMetaverseTypes" path="OpenMetaverse/Types" type="Library" rootNamespace="OpenMetaverse">
+    <Project name="OpenMetaverseTypes" path="OpenMetaverseTypes" type="Library" rootNamespace="OpenMetaverse">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../bin/</OutputPath>
           <XmlDocFile>OpenMetaverseTypes.XML</XmlDocFile>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../bin/</ReferencePath>
       <Reference name="System"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
@@ -149,28 +149,7 @@
       <Reference name="XMLRPC"/>
 
       <Files>
-        <Match pattern="*.cs" recurse="true">
-          <Exclude name="Color4.cs"/>
-          <Exclude name="Matrix4.cs"/>
-          <Exclude name="Quaternion.cs"/>
-          <Exclude name="Ray.cs"/>
-          <Exclude name="Utils.cs"/>
-          <Exclude name="UtilsConversions.cs"/>
-          <Exclude name="UUID.cs"/>
-          <Exclude name="Vector2.cs"/>
-          <Exclude name="Vector3.cs"/>
-          <Exclude name="Vector3d.cs"/>
-          <Exclude name="Vector4.cs"/>
-          <Exclude name="BlockingQueue.cs"/>
-          <Exclude name="DoubleDictionary.cs"/>
-          <Exclude name="ThreadSafeDictionary.cs"/>
-          <Exclude name="ExpiringCache.cs"/>
-          <Exclude name="CircularQueue.cs"/>
-          <Exclude name="CRC32.cs"/>
-          <Exclude name="CircularHashedQueue.cs"/>
-          <Exclude name="TokenBucket.cs"/>
-          <Exclude name="Enums.cs"/>
-        </Match>
+        <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>