summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfoldertype.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-07-07 13:34:13 -0700
committerRichard Linden <none@none>2011-07-07 13:34:13 -0700
commit88a90aabcb5bdede24bb451d443239e1e116c4ea (patch)
tree9399a4aefc1a9017986e1c29f9c9077d6e3c74c7 /indra/newview/llviewerfoldertype.cpp
parent66dcc72870b19c6ada65a643ca33c779c9c9989b (diff)
parent8f7579e4e46bb8da9fece3125ae31c3bb885be96 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llviewerfoldertype.cpp')
-rw-r--r--indra/newview/llviewerfoldertype.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 42f780a8a3..9101222393 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -128,8 +128,10 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
addEntry(LLFolderType::FT_MY_OUTFITS, new ViewerFolderEntry("My Outfits", "Inv_SysOpen", "Inv_SysClosed", TRUE));
addEntry(LLFolderType::FT_MESH, new ViewerFolderEntry("Meshes", "Inv_SysOpen", "Inv_SysClosed", FALSE));
-
addEntry(LLFolderType::FT_INBOX, new ViewerFolderEntry("Inbox", "Inv_SysOpen", "Inv_SysClosed", FALSE));
+ addEntry(LLFolderType::FT_OUTBOX, new ViewerFolderEntry("Outbox", "Inv_SysOpen", "Inv_SysClosed", FALSE));
+
+ addEntry(LLFolderType::FT_BASIC_ROOT, new ViewerFolderEntry("Basic Root", "Inv_SysOpen", "Inv_SysClosed", FALSE));
addEntry(LLFolderType::FT_NONE, new ViewerFolderEntry("New Folder", "Inv_FolderOpen", "Inv_FolderClosed", FALSE, "default"));