Merge remote-tracking branch 'll/master'

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index cca6b9ce32..c13b63433c 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -1927,9 +1927,17 @@ BOOL LLFavoritesOrderStorage::saveFavoritesRecord(bool pref_changed)
 	pref_changed |= mRecreateFavoriteStorage;
 	mRecreateFavoriteStorage = false;
 
+	// Can get called before inventory is done initializing.
+	if (!gInventory.isInventoryUsable())
+	{
+		return FALSE;
+	}
+	
 	LLUUID favorite_folder= gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
 	if (favorite_folder.isNull())
-			return FALSE;
+	{
+		return FALSE;
+	}
 
 	LLInventoryModel::item_array_t items;
 	LLInventoryModel::cat_array_t cats;