diff options
author | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
commit | a7911c43791a76f0f93f920f527970125afdc730 (patch) | |
tree | 99228045170856cf7721e83274bc9d74b45f42a4 /indra/newview/llfasttimerview.cpp | |
parent | 444643aeb0b80fdfbe28e0e2faae56de9d4f6e4a (diff) | |
parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) |
merge changes for 5.1.0-release
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
-rw-r--r-- | indra/newview/llfasttimerview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 4110971fa5..9219dd0279 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -796,13 +796,13 @@ LLSD LLFastTimerView::analyzePerformanceLogDefault(std::istream& is) for(stats_map_t::iterator it = time_stats.begin(); it != time_stats.end(); ++it) { std::string label = it->first; - ret[label]["TotalTime"] = time_stats[label].mSum; + ret[label]["TotalTime"] = time_stats[label].getSum(); ret[label]["MeanTime"] = time_stats[label].getMean(); ret[label]["MaxTime"] = time_stats[label].getMaxValue(); ret[label]["MinTime"] = time_stats[label].getMinValue(); ret[label]["StdDevTime"] = time_stats[label].getStdDev(); - ret[label]["Samples"] = sample_stats[label].mSum; + ret[label]["Samples"] = sample_stats[label].getSum(); ret[label]["MaxSamples"] = sample_stats[label].getMaxValue(); ret[label]["MinSamples"] = sample_stats[label].getMinValue(); ret[label]["StdDevSamples"] = sample_stats[label].getStdDev(); |