summaryrefslogtreecommitdiff
path: root/indra/llinventory/llfoldertype.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-08-17 16:00:04 -0400
committerOz Linden <oz@lindenlab.com>2015-08-17 16:00:04 -0400
commitfe2eefd9139a860cd9ffa67ee5f148ba3922320c (patch)
treed0395a805b44f525a5614bb2b3489d944555c170 /indra/llinventory/llfoldertype.cpp
parent4fb66604c9767bf518575963e9d4a871800bdeb3 (diff)
parent1be63209331d509396bd7ee79302d511fe83d72e (diff)
merge changes for 3.8.3-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));
};