diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:45:49 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:45:49 +0300 |
| commit | f94a19e09ebcf51e3e6cd3437fe364b60755406f (patch) | |
| tree | fa4f585008c6f5aa7850b2f5128a681b0065fcdc /indra/llcommon | |
| parent | d04a3b6d4e67dafa0b6dd8e88b752c5a929de5b0 (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
Merge downstream code 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...) |