diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-14 16:01:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-14 16:01:15 -0400 |
| commit | 67edc1edf5389ca74a114018a804c71deecdebc1 (patch) | |
| tree | 47513ac026187a19d595f36c46429b58aca90289 /indra/llcommon | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
| parent | 02757fc98ef1c56edce9de861a61828a9776f5f1 (diff) | |
merge 3.8.0-release and correct xml errors caused by reformatting
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...) |