SL-14570 - detailed breakdown of system folder issues in inventory validation. More info about expected state of system folders in llfoldertype

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 17777c3ceb..603f790815 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1807,6 +1807,13 @@ bool idle_startup()
 		// This method MUST be called before gInventory.findCategoryUUIDForType because of 
 		// gInventory.mIsAgentInvUsable is set to true in the gInventory.buildParentChildMap.
 		gInventory.buildParentChildMap();
+
+		// If inventory is unusable, need to flag this and
+		// bail out. In particular, must not trigger creation of new system
+		// categories.
+		LLPointer<LLInventoryValidationInfo> validation_info = gInventory.validate();
+		// FIXME add handling of unfixable corruption here - need to exit and get support to fix.
+		
 		gInventory.createCommonSystemCategories();
 
 		// It's debatable whether this flag is a good idea - sets all
@@ -1850,6 +1857,10 @@ bool idle_startup()
 		display_startup();
 		LLStartUp::setStartupState( STATE_MISC );
 		display_startup();
+
+		// Update status check after various system folders created.
+		validation_info = gInventory.validate();
+
 		return FALSE;
 	}