livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with https://hg.lindenlab.com/merov/viewer-thx1138

meow-7.2.2
Xiaohong Bao 2012-04-11 16:14:16 -06:00
parent 172b45d5a2 6eb53b7c42
commit 3c0e4e4324
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llappviewer.cpp
View File

@ -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;

2
indra/newview/lltexturefetch.cpp
View File

@ -1151,7 +1151,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
//1, not openning too many file descriptors at the same time;
//2, control the traffic of http so udp gets bandwidth.
//
static const S32 MAX_NUM_OF_HTTP_REQUESTS_IN_QUEUE = 8 ;
static const S32 MAX_NUM_OF_HTTP_REQUESTS_IN_QUEUE = 24 ;
if(mFetcher->getNumHTTPRequests() > MAX_NUM_OF_HTTP_REQUESTS_IN_QUEUE)
{
return false ; //wait.