diff --git a/indra/newview/llfloatermediafilter.cpp b/indra/newview/llfloatermediafilter.cpp
index 3384b05a9..3b636484b 100644
--- a/indra/newview/llfloatermediafilter.cpp
+++ b/indra/newview/llfloatermediafilter.cpp
@@ -74,7 +74,7 @@ void LLFloaterMediaFilter::updateLists(LLMediaFilter::EMediaList list_type)
 {
 	bool white(list_type == LLMediaFilter::WHITELIST);
 	const LLMediaFilter& inst(LLMediaFilter::instance());
-	LLMediaFilter::string_list_t list = white ? inst.getWhiteList() : inst.getBlackList();
+	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)
diff --git a/indra/newview/llmediafilter.cpp b/indra/newview/llmediafilter.cpp
index 9d5dacf1c..5521711d4 100644
--- a/indra/newview/llmediafilter.cpp
+++ b/indra/newview/llmediafilter.cpp
@@ -56,7 +56,7 @@ void LLMediaFilter::filterMediaUrl(LLParcel* parcel)
 
 	const std::string domain = extractDomain(url);
 	mCurrentParcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-    U32 enabled = gSavedSettings.getU32("MediaFilterEnable");
+	U32 enabled = gSavedSettings.getU32("MediaFilterEnable");
 
 	if (enabled > 1 && (filter(domain, WHITELIST) || filter(url, WHITELIST)))
 	{
@@ -104,7 +104,7 @@ void LLMediaFilter::filterAudioUrl(const std::string& url)
 
 	const std::string domain = extractDomain(url);
 	mCurrentParcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-    U32 enabled = gSavedSettings.getU32("MediaFilterEnable");
+	U32 enabled = gSavedSettings.getU32("MediaFilterEnable");
 	
 	if (enabled > 1 && (filter(domain, WHITELIST) || filter(url, WHITELIST)))
 	{
@@ -141,7 +141,7 @@ void LLMediaFilter::filterAudioUrl(const std::string& url)
 
 bool LLMediaFilter::filter(const std::string& url, EMediaList list)
 {
-	const string_list_t p_list = (list == WHITELIST) ? mWhiteList : mBlackList;
+	const string_list_t& p_list = (list == WHITELIST) ? mWhiteList : mBlackList;
 	string_list_t::const_iterator find_itr = std::find(p_list.begin(), p_list.end(), url);
 	return (find_itr != p_list.end());
 }
@@ -149,60 +149,34 @@ bool LLMediaFilter::filter(const std::string& url, EMediaList list)
 // List bizznizz
 void LLMediaFilter::addToMediaList(const std::string& in_url, EMediaList list, bool extract)
 {
-	std::string url = extract ? extractDomain(in_url) : in_url;
+	const std::string url = extract ? extractDomain(in_url) : in_url;
 	if (url.empty())
 	{
 		LL_INFOS("MediaFilter") << "No url found. Can't add to list." << LL_ENDL;
 		return;
 	}
 
-	switch (list)
+	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)
 	{
-		case WHITELIST:
-			// Check for duplicates
-			for (string_list_t::const_iterator itr = mWhiteList.begin(); itr != mWhiteList.end(); ++itr)
-			{
-				if (url == *itr)
-				{
-					LL_INFOS("MediaFilter") << "URL " << url << " already in list!" << LL_ENDL;
-					return;
-				}
-			}
-			mWhiteList.push_back(url);
-			mMediaListUpdate(WHITELIST);
-			break;
-		case BLACKLIST:
-			for (string_list_t::const_iterator itr = mBlackList.begin(); itr != mBlackList.end(); ++itr)
-			{
-				if (url == *itr)
-				{
-					LL_INFOS("MediaFilter") << "URL " << url << "already in list!" << LL_ENDL;
-					return;
-				}
-			}
-			mBlackList.push_back(url);
-			mMediaListUpdate(BLACKLIST);
-			break;
+		if (url == *itr)
+		{
+			LL_INFOS("MediaFilter") << "URL " << url << " already in list!" << LL_ENDL;
+			return;
+		}
 	}
+	p_list.push_back(url);
+	mMediaListUpdate(list);
 	saveMediaFilterToDisk();
 }
 
 void LLMediaFilter::removeFromMediaList(string_vec_t domains, EMediaList list)
 {
 	if (domains.empty()) return;
-	switch (list)
-	{
-		case WHITELIST:
-			for (string_vec_t::const_iterator itr = domains.begin(); itr != domains.end(); ++itr)
-				mWhiteList.remove(*itr);
-			mMediaListUpdate(WHITELIST);
-			break;
-		case BLACKLIST:
-			for (string_vec_t::const_iterator itr = domains.begin(); itr != domains.end(); ++itr)
-				mBlackList.remove(*itr);
-			mMediaListUpdate(BLACKLIST);
-			break;
-	}
+	for (string_vec_t::const_iterator itr = domains.begin(); itr != domains.end(); ++itr)
+		(list == WHITELIST ? mWhiteList : mBlackList).remove(*itr);
+	mMediaListUpdate(list);
 	saveMediaFilterToDisk();
 }
 
@@ -242,25 +216,24 @@ 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)
+	{
+		LLSD item;
+		item["domain"] = *itr;
+		item["action"] = action;
+		list_llsd.append(item);
+	}
+}
+
 void LLMediaFilter::saveMediaFilterToDisk() const
 {
 	const std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, MEDIALIST_XML);
 
 	LLSD medialist_llsd;
-	for (string_list_t::const_iterator itr = mWhiteList.begin(); itr != mWhiteList.end(); ++itr)
-	{
-		LLSD item;
-		item["domain"] = *itr;
-		item["action"] = "allow"; // <- $*#@()&%@
-		medialist_llsd.append(item);
-	}
-	for (string_list_t::const_iterator itr = mBlackList.begin(); itr != mBlackList.end(); ++itr)
-	{
-		LLSD item;
-		item["domain"] = *itr;
-		item["action"] = "deny"; // sigh.
-		medialist_llsd.append(item);
-	}
+	medialist_to_llsd(mWhiteList, medialist_llsd, "allow"); // <- $*#@()&%@
+	medialist_to_llsd(mBlackList, medialist_llsd, "deny"); // sigh.
 
 	llofstream medialist;
 	medialist.open(medialist_filename);
@@ -268,6 +241,30 @@ void LLMediaFilter::saveMediaFilterToDisk() const
 	medialist.close();
 }
 
+void perform_queued_command(LLMediaFilter& inst)
+{
+	if (U32 command = inst.getQueuedMediaCommand())
+	{
+		if (command == PARCEL_MEDIA_COMMAND_STOP)
+		{
+			LLViewerParcelMedia::stop();
+		}
+		else if (command == PARCEL_MEDIA_COMMAND_PAUSE)
+		{
+			LLViewerParcelMedia::pause();
+		}
+		else if (command == PARCEL_MEDIA_COMMAND_UNLOAD)
+		{
+			LLViewerParcelMedia::stop();
+		}
+		else if (command == PARCEL_MEDIA_COMMAND_TIME)
+		{
+			LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime);
+		}
+		inst.setQueuedMediaCommand(0);
+	}
+}
+
 bool handle_audio_filter_callback(const LLSD& notification, const LLSD& response, const std::string& url)
 {
 	LLMediaFilter& inst(LLMediaFilter::instance());
@@ -335,26 +332,9 @@ bool handle_audio_filter_callback(const LLSD& notification, const LLSD& response
 		if (queued_media)
 			inst.filterMediaUrl(queued_media);
 	}
-	else if (inst.getQueuedMediaCommand())
+	else
 	{
-		U32 command = inst.getQueuedMediaCommand();
-		if (command == PARCEL_MEDIA_COMMAND_STOP)
-		{
-			LLViewerParcelMedia::stop();
-		}
-		else if (command == PARCEL_MEDIA_COMMAND_PAUSE)
-		{
-			LLViewerParcelMedia::pause();
-		}
-		else if (command == PARCEL_MEDIA_COMMAND_UNLOAD)
-		{
-			LLViewerParcelMedia::stop();
-		}
-		else if (command == PARCEL_MEDIA_COMMAND_TIME)
-		{
-			LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime);
-		}
-		inst.setQueuedMediaCommand(0);
+		perform_queued_command(inst);
 	}
 
 	return false;
@@ -365,7 +345,7 @@ bool handle_media_filter_callback(const LLSD& notification, const LLSD& response
 	LLMediaFilter& inst(LLMediaFilter::instance());
 	inst.setAlertStatus(false);
 	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-	const std::string url = notification["payload"].asString();
+	const std::string& url = notification["payload"].asString();
 	LLParcel* queue = inst.getQueuedMedia();
 	switch(option)
 	{
@@ -403,26 +383,9 @@ bool handle_media_filter_callback(const LLSD& notification, const LLSD& response
 		inst.clearQueuedAudio();
 		inst.filterAudioUrl(audio_queue);
 	}
-	else if (inst.getQueuedMediaCommand())
+	else
 	{
-		U32 command = inst.getQueuedMediaCommand();
-		if (command == PARCEL_MEDIA_COMMAND_STOP)
-		{
-			LLViewerParcelMedia::stop();
-		}
-		else if (command == PARCEL_MEDIA_COMMAND_PAUSE)
-		{
-			LLViewerParcelMedia::pause();
-		}
-		else if (command == PARCEL_MEDIA_COMMAND_UNLOAD)
-		{
-			LLViewerParcelMedia::stop();
-		}
-		else if (command == PARCEL_MEDIA_COMMAND_TIME)
-		{
-			LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime);
-		}
-		inst.setQueuedMediaCommand(0);
+		perform_queued_command(inst);
 	}
 
 	return false;
@@ -471,6 +434,6 @@ std::string extractDomain(const std::string& in_url)
 
 	// Now map the whole thing to lowercase, since domain names aren't
 	//  case sensitive.
-	std::transform(url.begin(), url.end(),url.begin(), ::tolower);
+	std::transform(url.begin(), url.end(), url.begin(), ::tolower);
 	return url;
 }