diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-29 10:40:45 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-29 10:40:45 -0800 |
| commit | e919349054c8ae80a054f047756e6596b58a3e13 (patch) | |
| tree | 4d2abc589c448fe2b54f7be09385e644fd5b87af /indra/newview/llviewerfoldertype.cpp | |
| parent | ec6893db5099b1e95802254277de0cc2e9bea83c (diff) | |
| parent | adeb71d98279fc4e8af7859cd36114be9f95e6da (diff) | |
Merge with viewer-experience
Diffstat (limited to 'indra/newview/llviewerfoldertype.cpp')
| -rw-r--r-- | indra/newview/llviewerfoldertype.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp index c39df7efce..a179b61cff 100644 --- a/indra/newview/llviewerfoldertype.cpp +++ b/indra/newview/llviewerfoldertype.cpp @@ -30,7 +30,6 @@ #include "lldictionary.h" #include "llmemory.h" #include "llvisualparam.h" -#include "llviewercontrol.h" static const std::string empty_string; @@ -267,7 +266,7 @@ BOOL LLViewerFolderType::lookupIsQuietType(LLFolderType::EType folder_type) bool LLViewerFolderType::lookupIsHiddenIfEmpty(LLFolderType::EType folder_type) { const ViewerFolderEntry *entry = LLViewerFolderDictionary::getInstance()->lookup(folder_type); - if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders") && entry) + if (entry) { return entry->mHideIfEmpty; } |