diff options
author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-08-04 05:00:59 +0300 |
---|---|---|
committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-08-04 05:00:59 +0300 |
commit | b5378f93b298098cf841286ba6eb970ee5d855eb (patch) | |
tree | c2f395318d33ae90c12d88d4258796b7ce6db62d /indra/llcommon | |
parent | 8f5676202821b9b8addb19fe8b93bac56057c6af (diff) | |
parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) |
Merge viewer-release and become version 3.8.3
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...) |