Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
index 5c9b968ac9..79815e7be5 100755
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@@ -446,9 +446,9 @@ void LLPanelLandmarkInfo::populateFoldersList()
 	typedef std::vector<folder_pair_t> folder_vec_t;
 	folder_vec_t folders;
 	// Sort the folders by their full name.
-	for (S32 i = 0; i < cats.count(); i++)
+	for (S32 i = 0; i < cats.size(); i++)
 	{
-		const LLViewerInventoryCategory* cat = cats.get(i);
+		const LLViewerInventoryCategory* cat = cats.at(i);
 		std::string cat_full_name = getFullFolderName(cat);
 		folders.push_back(folder_pair_t(cat->getUUID(), cat_full_name));
 	}
@@ -487,6 +487,6 @@ static void collectLandmarkFolders(LLInventoryModel::cat_array_t& cats)
 	}
 	else
 	{
-		cats.put(favorites_cat);
+		cats.push_back(favorites_cat);
 	}
 }