summaryrefslogtreecommitdiff
path: root/indra/llcommon/llassettype.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-06-14 23:04:11 -0500
committerDave Parks <davep@lindenlab.com>2010-06-14 23:04:11 -0500
commit37a8c12bd34b2bd119b50f32d6e081ab59d1f5c4 (patch)
treeccdc7a5952a55dab7417251b248a25f6ca6fd530 /indra/llcommon/llassettype.h
parentb3fc9c79f559c84893dede3ce643ac0dfd1f3d65 (diff)
parentad5a45624a702433d481c3dbc0f348a8755b367c (diff)
merge
Diffstat (limited to 'indra/llcommon/llassettype.h')
-rw-r--r--indra/llcommon/llassettype.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h
index 2c2dc27aaa..ebc43134cb 100644
--- a/indra/llcommon/llassettype.h
+++ b/indra/llcommon/llassettype.h
@@ -114,8 +114,12 @@ public:
AT_LINK_FOLDER = 25,
// Inventory folder link
-
- AT_COUNT = 26,
+#if LL_MESH_ENABLED
+ AT_MESH = 49,
+ // Mesh data in our proprietary SLM format
+#endif
+
+ AT_COUNT = 50,
// +*********************************************************+
// | TO ADD AN ELEMENT TO THIS ENUM: |