summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-08 20:16:35 -0400
committerOz Linden <oz@lindenlab.com>2011-07-08 20:16:35 -0400
commit093fdcfcd3debd74dc773bf52faa07ea9f5f8b31 (patch)
tree9b3a0f7e37ef731cb9d35ef4e87c17a4c3c4b255 /indra/newview/llviewerinventory.cpp
parent187bc5211437718016a22e60c7b5ed29823c8510 (diff)
parent255fc0401ebde80cfde88995a18fc77a36e3479b (diff)
merge changes for storm-1489
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r--indra/newview/llviewerinventory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 9e58acdcd3..22666cec0d 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1269,7 +1269,7 @@ void menu_create_inventory_item(LLFolderView* root, LLFolderBridge *bridge, cons
{
std::string type_name = userdata.asString();
- if (("category" == type_name) || ("current" == type_name) || ("outfit" == type_name) || ("my_otfts" == type_name))
+ if (("inbox" == type_name) || ("outbox" == type_name) || ("category" == type_name) || ("current" == type_name) || ("outfit" == type_name) || ("my_otfts" == type_name))
{
LLFolderType::EType preferred_type = LLFolderType::lookup(type_name);