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 /// /// Holds information about a grid region /// + // 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 /// The contents of the object are for sale Contents = 3 } + + /// + /// Types of wearable assets + /// + public enum WearableType : byte + { + /// Body shape + Shape = 0, + /// Skin textures and attributes + Skin, + /// Hair + Hair, + /// Eyes + Eyes, + /// Shirt + Shirt, + /// Pants + Pants, + /// Shoes + Shoes, + /// Socks + Socks, + /// Jacket + Jacket, + /// Gloves + Gloves, + /// Undershirt + Undershirt, + /// Underpants + Underpants, + /// Skirt + Skirt, + /// Invalid wearable asset + 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 @@ - + - ../../bin/ + ../bin/ - ../../bin/ + ../bin/ OpenMetaverseTypes.XML - ../../bin/ + ../bin/ @@ -149,28 +149,7 @@ - - - - - - - - - - - - - - - - - - - - - - +