summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-03-06 18:15:51 -0800
committerMerov Linden <merov@lindenlab.com>2014-03-06 18:15:51 -0800
commita030b30d34ef3152791b123c4f52d4086f3eb549 (patch)
tree27e77628ed69c53b7eb3ff4c3205eaf10e79a0c0 /indra/llcommon
parentc7e2f81bbf299cf884d9e687fc4a7e7f7096c877 (diff)
DD-4, DD-5, DD-6, DD-7, DD-8: WIP : Add Merchant Items panel and make it somewhat work, in a clunky sort of way
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/llfoldertype.cpp2
-rw-r--r--indra/llcommon/llfoldertype.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp
index 9c38349cf7..64bc17c422 100755
--- a/indra/llcommon/llfoldertype.cpp
+++ b/indra/llcommon/llfoldertype.cpp
@@ -96,6 +96,8 @@ LLFolderDictionary::LLFolderDictionary()
addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", FALSE));
addEntry(LLFolderType::FT_BASIC_ROOT, new FolderEntry("basic_rt", TRUE));
+
+ addEntry(LLFolderType::FT_MERCHANT_ITEMS, new FolderEntry("merchant", FALSE));
addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE));
};
diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h
index a0c847914f..81f9c0b678 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llcommon/llfoldertype.h
@@ -87,6 +87,8 @@ public:
FT_BASIC_ROOT = 52,
+ FT_MERCHANT_ITEMS = 53,
+
FT_COUNT,
FT_NONE = -1