diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-08-11 11:54:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-08-11 11:54:57 -0400 |
| commit | 1f23f5a65b3634be39815f853cc008a8b5ad833e (patch) | |
| tree | af5f60fafb3b6af5225136a4effe3025e4ad09a6 /indra/llcommon | |
| parent | 71a468c6fb52f2f2cc7ebd17e548e9eaf3a875a5 (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
merge changes for 3.8.2-release
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llassettype.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h index 5a95a58d93..3a4b5dad18 100755 --- a/indra/llcommon/llassettype.h +++ b/indra/llcommon/llassettype.h @@ -107,6 +107,9 @@ public: AT_LINK_FOLDER = 25, // Inventory folder link + AT_MARKETPLACE_FOLDER = 26, + // Marketplace folder. Same as an AT_CATEGORY but different display methods. + AT_WIDGET = 40, // UI Widget: this is *not* an inventory asset type, only a viewer side asset (e.g. button, other ui items...) |