diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-06 16:35:46 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-06 16:35:46 -0600 |
| commit | ddef4d7ff74ecff49e76afca58d1d3c2486e8af3 (patch) | |
| tree | d668ebf925b26e87b906e654d8716dc7df731cdd /indra/newview/llappviewer.cpp | |
| parent | 576b9339977f50edb11a799d7a274610263f9fdc (diff) | |
revert some LLUnit changes to temporarily fix SH-4399: Interesting: Texture console MB Bound 0/384 and texture queue bounces once per second
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d544b992ef..9d30830e71 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -294,7 +294,7 @@ U32 gForegroundFrameCount = 0; // number of frames that app window was in foregr LLPumpIO* gServicePump = NULL; LLUnitImplicit<U64, LLUnits::Microseconds> gFrameTime = 0; -LLUnitImplicit<F32, LLUnits::Seconds> gFrameTimeSeconds = 0.f; +F32 gFrameTimeSeconds = 0.f; LLUnitImplicit<F32, LLUnits::Seconds> gFrameIntervalSeconds = 0.f; F32 gFPSClamped = 10.f; // Pretend we start at target rate. F32 gFrameDTClamped = 0.f; // Time between adjacent checks to network for packets @@ -1464,7 +1464,7 @@ bool LLAppViewer::mainLoop() ms_sleep(500); } - const F64 max_idle_time = llmin(.005*10.0*gFrameTimeSeconds, LLUnitImplicit<F32, LLUnits::Seconds>(0.005f)); // 5 ms a second + const F64 max_idle_time = llmin(.005f*10.0f*gFrameTimeSeconds, (0.005f)); // 5 ms a second idleTimer.reset(); S32 total_work_pending = 0; S32 total_io_pending = 0; |