From 13a7fbc7a0cf460b4f57028b2e46c33426aa3a01 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 16 Nov 2011 17:48:10 -0800
Subject: [PATCH] EXP-1498 : Add a debug setting DebugHideEmptySystemFolders
which is OFF by default so that we can control showing or hidding of system
folders (this is temporary so we unblock testers).
---
indra/newview/app_settings/settings.xml | 11 +++++++++++
indra/newview/llviewerfoldertype.cpp | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a7dabeb5637..e9b4d4d96db 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1893,6 +1893,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>DebugHideEmptySystemFolders</key>
+ <map>
+ <key>Comment</key>
+ <string>Hide empty system folders when on</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>DebugInventoryFilters</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index a179b61cffc..c39df7efce3 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -30,6 +30,7 @@
#include "lldictionary.h"
#include "llmemory.h"
#include "llvisualparam.h"
+#include "llviewercontrol.h"
static const std::string empty_string;
@@ -266,7 +267,7 @@ BOOL LLViewerFolderType::lookupIsQuietType(LLFolderType::EType folder_type)
bool LLViewerFolderType::lookupIsHiddenIfEmpty(LLFolderType::EType folder_type)
{
const ViewerFolderEntry *entry = LLViewerFolderDictionary::getInstance()->lookup(folder_type);
- if (entry)
+ if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders") && entry)
{
return entry->mHideIfEmpty;
}
--
GitLab