summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-04-13 10:54:31 -0700
committerMerov Linden <merov@lindenlab.com>2012-04-13 10:54:31 -0700
commit18fa5cd60ba673ce168095d277e9e34599b56547 (patch)
treec8424611a04ab27ff0385a5daed7d444b2d04a65 /indra/newview/llappviewer.cpp
parentb4a3bb4f3b6247ebcd7d084df601ae77161664e1 (diff)
parent0a42495906fdc56eeb118ac41ffa9ebcadc8de17 (diff)
Pull from viewer-thx1138
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 37119f4451..40920dfd07 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1339,13 +1339,11 @@ bool LLAppViewer::mainLoop()
ms_sleep(500);
}
- static const F64 FRAME_SLOW_THRESHOLD = 0.5; //2 frames per seconds
const F64 max_idle_time = llmin(.005*10.0*gFrameTimeSeconds, 0.005); // 5 ms a second
idleTimer.reset();
- bool is_slow = (frameTimer.getElapsedTimeF64() > FRAME_SLOW_THRESHOLD) ;
S32 total_work_pending = 0;
S32 total_io_pending = 0;
- while(!is_slow)//do not unpause threads if the frame rates are very low.
+ while(1)
{
S32 work_pending = 0;
S32 io_pending = 0;