diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-04-13 17:20:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-04-13 17:20:53 -0700 |
| commit | adf5b5c1efaed30dc043652b174d76c9088f4b18 (patch) | |
| tree | 7ebd44c36f7777413406b4043ab436b492600e02 /indra/newview/llappviewer.cpp | |
| parent | 8778010feec5193c5ffc88d70e4a303aebaaaee4 (diff) | |
| parent | 8b3703bd03487e6d70a793427ed1587b1cd86808 (diff) | |
Final pull from viewer-thx1138
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9a52ee4312..a627f3868b 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; @@ -1950,7 +1948,7 @@ bool LLAppViewer::initThreads() static const bool enable_threads = true; #endif - LLImage::initClass(gSavedSettings.getBOOL("TextureNewByteRange")); + LLImage::initClass(gSavedSettings.getBOOL("TextureNewByteRange"),gSavedSettings.getS32("TextureReverseByteRange")); LLVFSThread::initClass(enable_threads && false); LLLFSThread::initClass(enable_threads && false); |