From 57ae9c4dc4d97fd93faa33037ff0cb40ca9ecd54 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 12 May 2022 13:39:01 +0100 Subject: SL-17243 - moved inventory warnings to a map --- indra/newview/llinventorymodel.h | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'indra/newview/llinventorymodel.h') diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index e19f41bd24..c4133ff9bb 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -65,32 +65,19 @@ public: void toOstream(std::ostream& os) const; void asLLSD(LLSD& sd) const; - + bool mInitialized{false}; S32 mWarningCount{0}; - S32 mWarningCategoryMapSize{0}; - S32 mWarningNullCat{0}; - S32 mWarningUnknownAncestorStatus{0}; - S32 mWarningCatIDIndexMismatch{0}; - S32 mWarningNullParent{0}; - S32 mWarningDirectDescendents{0}; - S32 mWarningInvalidDescendentCount{0}; - S32 mWarningNullItemAtIndex{0}; - S32 mWarningWrongParentForItem{0}; - S32 mWarningItemNotInTopMap{0}; - S32 mWarningTopmostAncestorNotFound{0}; - S32 mWarningTopmostAncestorNotRecognized{0}; - S32 mWarningItemIDMismatch{0}; - S32 mWarningMissingSystemFolderCanCreate{0}; - S32 mWarningNonFatalSystemDuplicateUnderRoot{0}; - S32 mWarningSystemDuplicateElsewhere{0}; + std::map mWarnings; + S32 mLoopCount{0}; // Presence of folders whose ancestors loop onto themselves S32 mOrphanedCount{0}; // Missing or orphaned items, links and folders - bool mInitialized{false}; + S32 mFatalErrorCount{0}; bool mFatalNoRootFolder{false}; S32 mFatalSystemDuplicate{0}; bool mFatalNoLibraryRootFolder{false}; bool mFatalQADebugMode{false}; + std::set mMissingRequiredSystemFolders; std::set mDuplicateRequiredSystemFolders; }; -- cgit v1.3