diff options
| author | Richard Linden <none@none> | 2013-06-04 10:54:12 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-04 10:54:12 -0700 |
| commit | 715385eed7b2276963015861d7e6b8196e6ae5cd (patch) | |
| tree | 87d53b1431b1748bbb15582b7cafcccd3279dd53 /indra/newview | |
| parent | 5b48107dbf969529267874bff9a0a4b892b348cf (diff) | |
BUILDFIX: don't multiple define class statics...use inline static method instead
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 1a5b43c703..f7abb982e1 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -523,12 +523,18 @@ void LLSceneMonitor::dumpToFile(std::string file_name) std::ostringstream row; row << it->getName(); + const char* unit_label = it->getUnitLabel(); + if(unit_label[0]) + { + row << "(" << unit_label << ")"; + } + S32 samples = 0; - for (S32 i = frame_count - 1; i >= 0; --i) + for (S32 frame = 0; frame < frame_count; frame++) { - samples += scene_load_recording.getPrevRecording(i).getSampleCount(*it); - row << ", " << scene_load_recording.getPrevRecording(i).getSum(*it); + samples += scene_load_recording.getPrevRecording(frame_count - frame).getSampleCount(*it); + row << ", " << scene_load_recording.getPrevRecording(frame_count - frame).getSum(*it); } row << std::endl; @@ -550,10 +556,10 @@ void LLSceneMonitor::dumpToFile(std::string file_name) S32 samples = 0; - for (S32 i = frame_count - 1; i >= 0; --i) + for (S32 frame = 0; frame < frame_count; frame++) { - samples += scene_load_recording.getPrevRecording(i).getSampleCount(*it); - row << ", " << scene_load_recording.getPrevRecording(i).getMean(*it); + samples += scene_load_recording.getPrevRecording(frame_count - frame).getSampleCount(*it); + row << ", " << scene_load_recording.getPrevRecording(frame_count - frame).getMean(*it); } row << std::endl; @@ -575,10 +581,10 @@ void LLSceneMonitor::dumpToFile(std::string file_name) S32 samples = 0; - for (S32 i = frame_count - 1; i >= 0; --i) + for (S32 frame = 0; frame < frame_count; frame++) { - samples += scene_load_recording.getPrevRecording(i).getSampleCount(*it); - row << ", " << scene_load_recording.getPrevRecording(i).getMean(*it); + samples += scene_load_recording.getPrevRecording(frame_count - frame).getSampleCount(*it); + row << ", " << scene_load_recording.getPrevRecording(frame_count - frame).getMean(*it); } row << std::endl; @@ -596,9 +602,9 @@ void LLSceneMonitor::dumpToFile(std::string file_name) { os << it->getName(); - for (S32 i = frame_count - 1; i >= 0; --i) + for (S32 frame = 0; frame < frame_count; frame++) { - os << ", " << scene_load_recording.getPrevRecording(i).getSum(*it).as<LLUnits::Megabytes>().value(); + os << ", " << scene_load_recording.getPrevRecording(frame_count - frame).getSum(*it).value(); } os << std::endl; @@ -606,7 +612,6 @@ void LLSceneMonitor::dumpToFile(std::string file_name) os.flush(); os.close(); - } //------------------------------------------------------------------------------------------------------------- |