Merge branch 'master' into ubitworkmaster

2014-09-23 23:28:38 +01:00 · 2014-09-23 23:28:38 +01:00 · ac09dd9946
parent f37364b56f 80f3e8edbc
commit ac09dd9946
1 changed files with 11 additions and 8 deletions
--- a/OpenSim/Framework/CustomTypes.cs
+++ b/OpenSim/Framework/CustomTypes.cs
@ -27,14 +27,17 @@

 using System;

-public const sbyte CustomTypeBase = 0x60;
-
+namespace OpenSim.Framework
+{
    public enum CustomAssetType : sbyte
    {
+        CustomTypeBase = 0x60,
        AnimationSet = 0x60,
    }

    public enum CustomInventoryType : sbyte
    {
+        CustomTypeBase = 0x60,
        AnimationSet = 0x60,
    }
+}