diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-30 15:29:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-30 15:29:27 -0700 |
| commit | c780f730fed7ed90bf7228fd42e9ea46b8bce1cc (patch) | |
| tree | 9a617520758cc01fcf0792a8bde24f3fee3e8612 /indra/newview/llviewerfoldertype.cpp | |
| parent | 68b62747edb7073dd3f4975e2b38388ae80d801c (diff) | |
| parent | 4885c122eaf1b4e304ce598f308d806322efacfc (diff) | |
DD-92 : pull merge lindenlab/sunshine-external to get AISv3 work
Diffstat (limited to 'indra/newview/llviewerfoldertype.cpp')
| -rw-r--r-- | 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 289c1b1530..e633282be8 100644 --- a/indra/newview/llviewerfoldertype.cpp +++ b/indra/newview/llviewerfoldertype.cpp @@ -147,14 +147,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() |