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/llinventory | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
| parent | 02757fc98ef1c56edce9de861a61828a9776f5f1 (diff) | |
merge 3.8.0-release and correct xml errors caused by reformatting
Diffstat (limited to 'indra/llinventory')
| -rwxr-xr-x | indra/llinventory/llfoldertype.cpp | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llinventory/llfoldertype.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp index 23bf6da1f9..86aca77de8 100755 --- a/indra/llinventory/llfoldertype.cpp +++ b/indra/llinventory/llfoldertype.cpp @@ -96,6 +96,10 @@ LLFolderDictionary::LLFolderDictionary() addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", TRUE)); addEntry(LLFolderType::FT_BASIC_ROOT, new FolderEntry("basic_rt", TRUE)); + + addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new FolderEntry("merchant", FALSE)); + addEntry(LLFolderType::FT_MARKETPLACE_STOCK, new FolderEntry("stock", FALSE)); + addEntry(LLFolderType::FT_MARKETPLACE_VERSION, new FolderEntry("version", FALSE)); addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE)); }; diff --git a/indra/llinventory/llfoldertype.h b/indra/llinventory/llfoldertype.h index a0c847914f..515bb05a3f 100755..100644 --- a/indra/llinventory/llfoldertype.h +++ b/indra/llinventory/llfoldertype.h @@ -87,6 +87,10 @@ public: FT_BASIC_ROOT = 52, + FT_MARKETPLACE_LISTINGS = 53, + FT_MARKETPLACE_STOCK = 54, + FT_MARKETPLACE_VERSION = 55, // Note: We actually *never* create folders with that type. This is used for icon override only. + FT_COUNT, FT_NONE = -1 |