summaryrefslogtreecommitdiff
path: root/indra/newview/llfavoritesbar.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2011-01-10 16:08:02 -0500
committerprep <prep@lindenlab.com>2011-01-10 16:08:02 -0500
commit3fcdd7f41581e2e724be703687e717ea6ddc91ba (patch)
treef3b3d4226aadc515a737e7831d91c941baacddbe /indra/newview/llfavoritesbar.cpp
parent9c60d1da81ae711b702b83bb388083bc19702472 (diff)
parentb63a404613182edfd230abda595f064c7bcc1c10 (diff)
merge
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
-rw-r--r--indra/newview/llfavoritesbar.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 0c0fdd5572..0b17d64eb0 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -607,6 +607,15 @@ void LLFavoritesBarCtrl::changed(U32 mask)
}
else
{
+ LLInventoryModel::item_array_t items;
+ LLInventoryModel::cat_array_t cats;
+ LLIsType is_type(LLAssetType::AT_LANDMARK);
+ gInventory.collectDescendentsIf(mFavoriteFolderId, cats, items, LLInventoryModel::EXCLUDE_TRASH, is_type);
+
+ for (LLInventoryModel::item_array_t::iterator i = items.begin(); i != items.end(); ++i)
+ {
+ (*i)->getSLURL();
+ }
updateButtons();
}
}