From 1049089dd1c2ad1cc7c610b7c49c5ec438e96c9f Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 28 Jan 2022 17:51:29 +0000
Subject: [PATCH] SL-16715 - viewerstats, added more detail about failure cases
in inventory
---
indra/newview/llinventorymodel.cpp | 11 ++++++++++-
indra/newview/llinventorymodel.h | 3 +++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index bf07793e8b9..b4fc8325965 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -138,7 +138,10 @@ bool LLCanCache::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
LLInventoryValidationInfo::LLInventoryValidationInfo():
mFatalErrorCount(0),
mWarningCount(0),
- mInitialized(false)
+ mInitialized(false),
+ mFatalNoRootFolder(false),
+ mFatalNoLibraryRootFolder(false),
+ mFatalQADebugMode(false)
{
}
@@ -160,6 +163,9 @@ void LLInventoryValidationInfo::asLLSD(LLSD& sd) const
sd["warning_count"] = mWarningCount;
sd["initialized"] = mInitialized;
sd["missing_system_folders_count"] = LLSD::Integer(mMissingRequiredSystemFolders.size());
+ sd["fatal_no_root_folder"] = mFatalNoRootFolder;
+ sd["fatal_no_library_root_folder"] = mFatalNoLibraryRootFolder;
+ sd["fatal_qa_debug_mode"] = mFatalQADebugMode;
if (mMissingRequiredSystemFolders.size()>0)
{
sd["missing_system_folders"] = LLSD::emptyArray();
@@ -3850,11 +3856,13 @@ LLPointer<LLInventoryValidationInfo> LLInventoryModel::validate() const
if (getRootFolderID().isNull())
{
LL_WARNS("Inventory") << "Fatal inventory corruption: no root folder id" << LL_ENDL;
+ validation_info->mFatalNoRootFolder = true;
fatalities++;
}
if (getLibraryRootFolderID().isNull())
{
LL_WARNS("Inventory") << "Fatal inventory corruption: no library root folder id" << LL_ENDL;
+ validation_info->mFatalNoLibraryRootFolder = true;
fatalities++;
}
@@ -4196,6 +4204,7 @@ LLPointer<LLInventoryValidationInfo> LLInventoryModel::validate() const
// Force all counts to be either 0 or 2, thus flagged as an error.
count_under_root = 2*distrib(e);
count_elsewhere = 2*distrib(e);
+ validation_info->mFatalQADebugMode = true;
}
if (is_singleton)
{
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 403b86e3186..e81652820f5 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -69,6 +69,9 @@ class LLInventoryValidationInfo: public LLRefCount
S32 mFatalErrorCount;
S32 mWarningCount;
bool mInitialized;
+ bool mFatalNoRootFolder;
+ bool mFatalNoLibraryRootFolder;
+ bool mFatalQADebugMode;
std::set<LLFolderType::EType> mMissingRequiredSystemFolders;
std::set<LLFolderType::EType> mDuplicateRequiredSystemFolders;
};
--
GitLab