diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 21:56:26 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 21:56:26 +0000 |
| commit | e71201ac125cab5f3d3cf7d6a30500253fc29d90 (patch) | |
| tree | 270e46eb85dd46fb6962a36a9357dbf31c3afb29 /indra/newview/llfavoritesbar.cpp | |
| parent | 2d63d2044e0a00d1969c3da254e016a6e520c0d5 (diff) | |
| parent | 035b1996df3f357b5060e3eb778588da5b9e7b37 (diff) | |
Merged in DV528-merge-6.5.5 (pull request #945)
DRTVWR-528 merge up to 6.5.5
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 10 |
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; |