1 files changed, 18 insertions, 26 deletions

diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index 5ab0013055..2c0c38dc75 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -559,16 +559,14 @@ void LLSceneMonitor::dumpToFile(std::string file_name)
 
 
 	typedef StatType<CountAccumulator> trace_count;
-	for (trace_count::instance_iter it = trace_count::beginInstances(), end_it = trace_count::endInstances();
-		it != end_it;
-		++it)
+	for (auto& it : trace_count::instance_snapshot())
 	{
 		std::ostringstream row;
 		row << std::setprecision(10);
 
-		row << it->getName();
+		row << it.getName();
 
-		const char* unit_label = it->getUnitLabel();
+		const char* unit_label = it.getUnitLabel();
 		if(unit_label[0])
 		{
 			row << "(" << unit_label << ")";
@@ -579,8 +577,8 @@ void LLSceneMonitor::dumpToFile(std::string file_name)
 		for (S32 frame = 1; frame <= frame_count; frame++)
 		{
 			Recording& recording = scene_load_recording.getPrevRecording(frame_count - frame);
-			samples += recording.getSampleCount(*it);
-			row << ", " << recording.getSum(*it);
+			samples += recording.getSampleCount(it);
+			row << ", " << recording.getSum(it);
 		}
 
 		row << '\n';
@@ -593,15 +591,13 @@ void LLSceneMonitor::dumpToFile(std::string file_name)
 
 	typedef StatType<EventAccumulator> trace_event;
 
-	for (trace_event::instance_iter it = trace_event::beginInstances(), end_it = trace_event::endInstances();
-		it != end_it;
-		++it)
+	for (auto& it : trace_event::instance_snapshot())
 	{
 		std::ostringstream row;
 		row << std::setprecision(10);
-		row << it->getName();
+		row << it.getName();
 
-		const char* unit_label = it->getUnitLabel();
+		const char* unit_label = it.getUnitLabel();
 		if(unit_label[0])
 		{
 			row << "(" << unit_label << ")";
@@ -612,8 +608,8 @@ void LLSceneMonitor::dumpToFile(std::string file_name)
 		for (S32 frame = 1; frame <= frame_count; frame++)
 		{
 			Recording& recording = scene_load_recording.getPrevRecording(frame_count - frame);
-			samples += recording.getSampleCount(*it);
-			F64 mean = recording.getMean(*it);
+			samples += recording.getSampleCount(it);
+			F64 mean = recording.getMean(it);
 			if (llisnan(mean))
 			{
 				row << ", n/a";
@@ -634,15 +630,13 @@ void LLSceneMonitor::dumpToFile(std::string file_name)
 
 	typedef StatType<SampleAccumulator> trace_sample;
 
-	for (trace_sample::instance_iter it = trace_sample::beginInstances(), end_it = trace_sample::endInstances();
-		it != end_it;
-		++it)
+	for (auto& it : trace_sample::instance_snapshot())
 	{
 		std::ostringstream row;
 		row << std::setprecision(10);
-		row << it->getName();
+		row << it.getName();
 
-		const char* unit_label = it->getUnitLabel();
+		const char* unit_label = it.getUnitLabel();
 		if(unit_label[0])
 		{
 			row << "(" << unit_label << ")";
@@ -653,8 +647,8 @@ void LLSceneMonitor::dumpToFile(std::string file_name)
 		for (S32 frame = 1; frame <= frame_count; frame++)
 		{
 			Recording& recording = scene_load_recording.getPrevRecording(frame_count - frame);
-			samples += recording.getSampleCount(*it);
-			F64 mean = recording.getMean(*it);
+			samples += recording.getSampleCount(it);
+			F64 mean = recording.getMean(it);
 			if (llisnan(mean))
 			{
 				row << ", n/a";
@@ -674,15 +668,13 @@ void LLSceneMonitor::dumpToFile(std::string file_name)
 	}
 
 	typedef StatType<MemAccumulator> trace_mem;
-	for (trace_mem::instance_iter it = trace_mem::beginInstances(), end_it = trace_mem::endInstances();
-		it != end_it;
-		++it)
+	for (auto& it : trace_mem::instance_snapshot())
 	{
-		os << it->getName() << "(KiB)";
+		os << it.getName() << "(KiB)";
 
 		for (S32 frame = 1; frame <= frame_count; frame++)
 		{
-			os << ", " << scene_load_recording.getPrevRecording(frame_count - frame).getMax(*it).valueInUnits<LLUnits::Kilobytes>();
+			os << ", " << scene_load_recording.getPrevRecording(frame_count - frame).getMax(it).valueInUnits<LLUnits::Kilobytes>();
 		}
 
 		os << '\n';