diff --git a/indra/newview/llfloatermediafilter.cpp b/indra/newview/llfloatermediafilter.cpp
index 3b636484b..f03216ff0 100644
--- a/indra/newview/llfloatermediafilter.cpp
+++ b/indra/newview/llfloatermediafilter.cpp
@@ -77,11 +77,11 @@ void LLFloaterMediaFilter::updateLists(LLMediaFilter::EMediaList list_type)
 	const LLMediaFilter::string_list_t& list = white ? inst.getWhiteList() : inst.getBlackList();
 	LLScrollListCtrl* scroll(white ? mWhitelist : mBlacklist);
 	scroll->clearRows();
-	for (LLMediaFilter::string_list_t::const_iterator itr = list.begin(); itr != list.end(); ++itr)
+	for (const auto& value : list)
 	{
 		LLSD element;
 		element["columns"][0]["column"] = "list";
-		element["columns"][0]["value"] = (*itr);
+		element["columns"][0]["value"] = value;
 		scroll->addElement(element);
 	}
 	enableButton(getChildView(white ? "remove_whitelist" : "remove_blacklist"), scroll);
@@ -103,9 +103,9 @@ void LLFloaterMediaFilter::onRemoveFromList(bool white)
 {
 	std::vector<LLScrollListItem*> selected = (white ? mWhitelist : mBlacklist)->getAllSelected();
 	LLMediaFilter::string_vec_t domains;
-	for (std::vector<LLScrollListItem*>::iterator itr = selected.begin(); itr != selected.end(); ++itr)
+	for (auto* item : selected)
 	{
-		domains.push_back((*itr)->getColumn(0)->getValue().asString());
+		domains.push_back(item->getColumn(0)->getValue().asString());
 	}
 	LLMediaFilter::getInstance()->removeFromMediaList(domains, white ? LLMediaFilter::WHITELIST : LLMediaFilter::BLACKLIST);
 }
diff --git a/indra/newview/llmediafilter.cpp b/indra/newview/llmediafilter.cpp
index 528dfc86f..e83546f8b 100644
--- a/indra/newview/llmediafilter.cpp
+++ b/indra/newview/llmediafilter.cpp
@@ -161,9 +161,9 @@ void LLMediaFilter::addToMediaList(const std::string& in_url, EMediaList list, b
 
 	string_list_t& p_list(list == WHITELIST ? mWhiteList : mBlackList);
 	// Check for duplicates
-	for (string_list_t::const_iterator itr = p_list.begin(); itr != p_list.end(); ++itr)
+	for (const auto& p : p_list)
 	{
-		if (url == *itr)
+		if (url == p)
 		{
 			LL_INFOS("MediaFilter") << "URL " << url << " already in list!" << LL_ENDL;
 			return;
@@ -177,8 +177,8 @@ void LLMediaFilter::addToMediaList(const std::string& in_url, EMediaList list, b
 void LLMediaFilter::removeFromMediaList(string_vec_t domains, EMediaList list)
 {
 	if (domains.empty()) return;
-	for (string_vec_t::const_iterator itr = domains.begin(); itr != domains.end(); ++itr)
-		(list == WHITELIST ? mWhiteList : mBlackList).remove(*itr);
+	for (const auto& domain : domains)
+		(list == WHITELIST ? mWhiteList : mBlackList).remove(domain);
 	mMediaListUpdate(list);
 	saveMediaFilterToDisk();
 }
@@ -221,10 +221,10 @@ void LLMediaFilter::loadMediaFilterFromDisk()
 
 void medialist_to_llsd(const LLMediaFilter::string_list_t& list, LLSD& list_llsd, const LLSD& action)
 {
-	for (LLMediaFilter::string_list_t::const_iterator itr = list.begin(); itr != list.end(); ++itr)
+	for (const auto& domain : list)
 	{
 		LLSD item;
-		item["domain"] = *itr;
+		item["domain"] = domain;
 		item["action"] = action;
 		list_llsd.append(item);
 	}