Merge branch 'master' into ubitworkmaster

avinationmerge
UbitUmarov 2014-09-23 23:28:38 +01:00
commit ac09dd9946
1 changed files with 11 additions and 8 deletions

View File

@ -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,
}
}