diff options
author | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:52:14 -0700 |
---|---|---|
committer | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:52:14 -0700 |
commit | 450b64981c878f558b597a2855bc18318555a532 (patch) | |
tree | d84598caf68980baa4eb3f058ada5b3ffb1c4dff /indra/newview/llviewerfoldertype.cpp | |
parent | 42daa3497b6626cbb5f32ba54162558cd025069b (diff) | |
parent | 44c7c6feaa824f4049d326965cb066e76ebefee3 (diff) |
Merge for STORM-1482
Diffstat (limited to 'indra/newview/llviewerfoldertype.cpp')
-rw-r--r-- | indra/newview/llviewerfoldertype.cpp | 4 |
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")); |