diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index 35cee6653..99aec9997 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -35,7 +35,9 @@ #include #include +#if !LL_WINDOWS #include // uintptr_t +#endif #include "llerror.h" diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index d24bff56b..8caf60b02 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1276,9 +1276,9 @@ bool LLTextureFetchWorker::doWork(S32 param) // static const LLCachedControl max_http_requests("HTTPMaxRequests", 32); static const LLCachedControl min_http_requests("HTTPMinRequests", 2); - if((mFetcher->getNumHTTPRequests() > max_http_requests) || + if(((U32)mFetcher->getNumHTTPRequests() > max_http_requests) || ((mFetcher->getTextureBandwidth() > mFetcher->mMaxBandwidth) && - (mFetcher->getNumHTTPRequests() > min_http_requests)) || + ((U32)mFetcher->getNumHTTPRequests() > min_http_requests)) || !sgConnectionThrottle()) { return false ; //wait.