summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-03-28 15:54:36 -0700
committerMerov Linden <merov@lindenlab.com>2014-03-28 15:54:36 -0700
commit0ec8fbec6deaa24506391ef239c50009eebe1eef (patch)
tree423ac61bbe3da83ad60ba8905e03287d2e6e8c3e /indra/llcommon
parent2f1bef16dc4549993db581ce410924c9b9966341 (diff)
DD-24 : Add FT_MARKETPLACE_STOCK as a new type for folders, implement the promotion code for Drag and Drop, display of stock folders and embryonic marketplace validation
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/llfoldertype.cpp1
-rw-r--r--indra/llcommon/llfoldertype.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp
index 5b80189d2a..afa9e59832 100755
--- a/indra/llcommon/llfoldertype.cpp
+++ b/indra/llcommon/llfoldertype.cpp
@@ -98,6 +98,7 @@ LLFolderDictionary::LLFolderDictionary()
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_NONE, new FolderEntry("-1", FALSE));
};
diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h
index 91dc1da543..20925eede0 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llcommon/llfoldertype.h
@@ -88,6 +88,7 @@ public:
FT_BASIC_ROOT = 52,
FT_MARKETPLACE_LISTINGS = 53,
+ FT_MARKETPLACE_STOCK = 54,
FT_COUNT,