diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:36:30 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:36:30 +0300 |
| commit | 01ba9f3cd69a40ddffcee84fda95460b0f87629e (patch) | |
| tree | ebf28dd52bcbc8d53b5e833242c7f36b725b2ec3 /indra/llinventory/llfoldertype.cpp | |
| parent | 246758a3b70256f2c776d5372296b858251fd820 (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
Merge downstream code and become version 3.8.3
Diffstat (limited to 'indra/llinventory/llfoldertype.cpp')
| -rwxr-xr-x | indra/llinventory/llfoldertype.cpp | 4 |
1 files changed, 4 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)); }; |