diff options
| author | Richard Linden <none@none> | 2013-04-08 13:59:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-08 13:59:19 -0700 |
| commit | 288b43facb89184cc8fced7e7542baa2c8549831 (patch) | |
| tree | 4cc9a03bc065810bbc39c6eda86852a6b3d6b53f /indra/newview/llscenemonitor.cpp | |
| parent | 164273afbb8131c5961266b7cb2c1e1d7973ea0b (diff) | |
| parent | b4967dfa4f3817c890644cb9a545264b65fd747a (diff) | |
Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.63pnn4\ssh__hg.lindenlab.com_richard_viewer-interesting-metrics_efdmpj.hg
Diffstat (limited to 'indra/newview/llscenemonitor.cpp')
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 3a2171a014..c06d9d2689 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -499,7 +499,7 @@ void LLSceneMonitor::fetchQueryResult() glGetQueryObjectuivARB(mQueryObject, GL_QUERY_RESULT_ARB, &count); mDiffResult = count * 0.5f / (mDiff->getWidth() * mDiff->getHeight() * mDiffPixelRatio * mDiffPixelRatio); //0.5 -> (front face + back face) - + addMonitorResult(); } @@ -511,14 +511,14 @@ void LLSceneMonitor::addMonitorResult() return; } - mRecording->extend(); - sample(sFramePixelDiff, mDiffResult); + mRecording->extend(); + sample(sFramePixelDiff, mDiffResult); ll_monitor_result_t result; result.mTimeStamp = LLImageGL::sLastFrameTime; result.mDiff = mDiffResult; mMonitorResults.push_back(result); -} + } //dump results to a file _scene_monitor_results.csv void LLSceneMonitor::dumpToFile(std::string file_name) |