diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-04 12:17:01 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-04 12:17:01 -0700 |
| commit | fc6c3fbe4271dcd9b64bdfd417514dc97ad7dd75 (patch) | |
| tree | bd09a20a2b4dd9384a92114eaeebe0d5bfac8e1e /indra/llcommon/llassettype.h | |
| parent | f3aac4c8ab45d52c4f038ad1a16768d9d8e0b201 (diff) | |
| parent | 44e9fb446f3c92c3dfd9b5be8a3e02ec5a44ba00 (diff) | |
Merge with latest
Diffstat (limited to 'indra/llcommon/llassettype.h')
| -rw-r--r-- | indra/llcommon/llassettype.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h index 74ccd00324..d538accbf7 100644 --- a/indra/llcommon/llassettype.h +++ b/indra/llcommon/llassettype.h @@ -108,9 +108,13 @@ public: AT_LINK_FOLDER = 25, // Inventory folder link + + AT_WIDGET = 40, + // UI Widget: this is *not* an inventory asset type, only a viewer side asset (e.g. button, other ui items...) + AT_MESH = 49, - // Mesh data in our proprietary SLM format - + // Mesh data in our proprietary SLM format + AT_COUNT = 50, // +*********************************************************+ |