diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-06-26 12:19:38 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-06-26 12:19:38 -0400 |
| commit | fd2893e23d002124c49416b7e7a497a1105d2fc4 (patch) | |
| tree | f2b39820a3c0b9290fd7db93ce6f4b7075d3186e /indra/newview/llviewerfoldertype.cpp | |
| parent | cbb83180e8ea6c1f64c77049ea62f2977f55e2f1 (diff) | |
SH-4305 WIP - cleanup
Diffstat (limited to 'indra/newview/llviewerfoldertype.cpp')
| -rwxr-xr-x | indra/newview/llviewerfoldertype.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp index a179b61cff..4e028d2163 100755 --- a/indra/newview/llviewerfoldertype.cpp +++ b/indra/newview/llviewerfoldertype.cpp @@ -139,14 +139,10 @@ LLViewerFolderDictionary::LLViewerFolderDictionary() addEntry(LLFolderType::FT_NONE, new ViewerFolderEntry("New Folder", "Inv_FolderOpen", "Inv_FolderClosed", FALSE, false, "default")); -#if SUPPORT_ENSEMBLES - initEnsemblesFromFile(); -#else for (U32 type = (U32)LLFolderType::FT_ENSEMBLE_START; type <= (U32)LLFolderType::FT_ENSEMBLE_END; ++type) { addEntry((LLFolderType::EType)type, new ViewerFolderEntry("New Folder", "Inv_FolderOpen", "Inv_FolderClosed", FALSE, false)); - } -#endif + } } bool LLViewerFolderDictionary::initEnsemblesFromFile() |