Merge branch 'master' into DRTVWR-486

1 files changed, 4 insertions, 8 deletions

diff --git a/indra/newview/llviewercontrollistener.cpp b/indra/newview/llviewercontrollistener.cpp
index d2484b2b23..3443bb644a 100644
--- a/indra/newview/llviewercontrollistener.cpp
+++ b/indra/newview/llviewercontrollistener.cpp
@@ -50,11 +50,9 @@ LLViewerControlListener::LLViewerControlListener()
 	std::ostringstream groupnames;
 	groupnames << "[\"group\"] is one of ";
 	const char* delim = "";
-	for (LLControlGroup::key_iter cgki(LLControlGroup::beginKeys()),
-								  cgkend(LLControlGroup::endKeys());
-		 cgki != cgkend; ++cgki)
+	for (const auto& key : LLControlGroup::key_snapshot())
 	{
-		groupnames << delim << '"' << *cgki << '"';
+		groupnames << delim << '"' << key << '"';
 		delim = ", ";
 	}
 	groupnames << '\n';
@@ -181,11 +179,9 @@ void LLViewerControlListener::groups(LLSD const & request)
 {
 	// No Info, we're not looking up either a group or a control name.
 	Response response(LLSD(), request);
-	for (LLControlGroup::key_iter cgki(LLControlGroup::beginKeys()),
-								  cgkend(LLControlGroup::endKeys());
-		 cgki != cgkend; ++cgki)
+	for (const auto& key : LLControlGroup::key_snapshot())
 	{
-		response["groups"].append(*cgki);
+		response["groups"].append(key);
 	}
 }