diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index dfdc9ccbe6d0ce0e041471ba0a991a50defbe366..1134410081852486e86d89afea48c32badc9a88b 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -1654,11 +1654,10 @@ void LLFloaterWorldMap::onCommitSearchResult()
 		return;
 	}
 	LLStringUtil::toLower(sim_name);
-	
-	std::map<U64, LLSimInfo*>::const_iterator it;
-	for (it = LLWorldMap::getInstance()->getRegionMap().begin(); it != LLWorldMap::getInstance()->getRegionMap().end(); ++it)
+
+	for (const auto& sim_info_pair : LLWorldMap::getInstance()->getRegionMap())
 	{
-		LLSimInfo* info = it->second;
+		LLSimInfo* info = sim_info_pair.second;
 		
 		if (info->isName(sim_name))
 		{