aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-09-23 23:28:38 +0100
committerUbitUmarov2014-09-23 23:28:38 +0100
commitac09dd9946b42fca00d1cf74940aa35fa84792d2 (patch)
treeac8d10d388e41372a20a877463a5b92ddc64b7b9
parentMerge branch 'master' into ubitworkmaster (diff)
parentFix stupid stuff. (diff)
downloadopensim-SC-ac09dd9946b42fca00d1cf74940aa35fa84792d2.zip
opensim-SC-ac09dd9946b42fca00d1cf74940aa35fa84792d2.tar.gz
opensim-SC-ac09dd9946b42fca00d1cf74940aa35fa84792d2.tar.bz2
opensim-SC-ac09dd9946b42fca00d1cf74940aa35fa84792d2.tar.xz
Merge branch 'master' into ubitworkmaster
-rw-r--r--OpenSim/Framework/CustomTypes.cs19
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 @@
27 27
28using System; 28using System;
29 29
30public const sbyte CustomTypeBase = 0x60; 30namespace OpenSim.Framework
31
32public enum CustomAssetType : sbyte
33{ 31{
34 AnimationSet = 0x60, 32 public enum CustomAssetType : sbyte
35} 33 {
34 CustomTypeBase = 0x60,
35 AnimationSet = 0x60,
36 }
36 37
37public enum CustomInventoryType : sbyte 38 public enum CustomInventoryType : sbyte
38{ 39 {
39 AnimationSet = 0x60, 40 CustomTypeBase = 0x60,
41 AnimationSet = 0x60,
42 }
40} 43}