diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-08-17 16:00:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-08-17 16:00:04 -0400 |
| commit | fe2eefd9139a860cd9ffa67ee5f148ba3922320c (patch) | |
| tree | d0395a805b44f525a5614bb2b3489d944555c170 /indra/llcommon | |
| parent | 4fb66604c9767bf518575963e9d4a871800bdeb3 (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge changes for 3.8.3-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...) |