Merge branch 'master' into ubitworkmaster

1 files changed, 11 insertions, 8 deletions

diff --git a/OpenSim/Framework/CustomTypes.cs b/OpenSim/Framework/CustomTypes.cs
index 6ad3456..d109c26 100644
--- a/OpenSim/Framework/CustomTypes.cs
+++ b/OpenSim/Framework/CustomTypes.cs
@@ -27,14 +27,17 @@
 
 using System;
 
-public const sbyte CustomTypeBase = 0x60;
-
-public enum CustomAssetType : sbyte
+namespace OpenSim.Framework
 {
-    AnimationSet = 0x60,
-}
+    public enum CustomAssetType : sbyte
+    {
+        CustomTypeBase = 0x60,
+        AnimationSet = 0x60,
+    }
 
-public enum CustomInventoryType : sbyte
-{
-    AnimationSet = 0x60,
+    public enum CustomInventoryType : sbyte
+    {
+        CustomTypeBase = 0x60,
+        AnimationSet = 0x60,
+    }
 }