summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-06-14 23:14:14 -0500
committerDave Parks <davep@lindenlab.com>2010-06-14 23:14:14 -0500
commit1b7b8aa00ea4329243125a1c53c90115ff7d6bfa (patch)
tree5ef154c052e043dbc500c034b4d718c5568643d2 /indra/llinventory
parent37a8c12bd34b2bd119b50f32d6e081ab59d1f5c4 (diff)
parent6e37ec08f678451a526f34218cb070d117cdf60a (diff)
merge
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llinventorytype.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llinventory/llinventorytype.h b/indra/llinventory/llinventorytype.h
index d2fc67ef64..17ed3df951 100644
--- a/indra/llinventory/llinventorytype.h
+++ b/indra/llinventory/llinventorytype.h
@@ -67,10 +67,7 @@ public:
IT_WEARABLE = 18,
IT_ANIMATION = 19,
IT_GESTURE = 20,
-
-#if LL_MESH_ENABLED
IT_MESH = 22,
-#endif
IT_COUNT = 23,
IT_NONE = -1