summaryrefslogtreecommitdiff
path: root/indra/llinventory/llfoldertype.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-08-04 15:47:37 -0700
committercallum_linden <none@none>2015-08-04 15:47:37 -0700
commit230bc8614765c0973fb91bca68238b9abcd12adf (patch)
tree8ccde7ba65ba2eb2d964c9e44e4a2ad6653111b2 /indra/llinventory/llfoldertype.cpp
parenta75a4e2a4f0b8bc65aa45368326fce0e6635c4ac (diff)
parent310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff)
Merge with viewer release
Diffstat (limited to 'indra/llinventory/llfoldertype.cpp')
-rwxr-xr-xindra/llinventory/llfoldertype.cpp4
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));
};