Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win compile fix. Including stdint.h explodes in vc2010, so #if'd it out for windows.

Browse Source
This commit is contained in:
Shyotl
2011-08-05 21:39:43 -05:00
parent 4dd888353d
commit f9bcbab5f3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llmemory.h
View File

@@ -35,7 +35,9 @@
#include <new> #include <new>
#include <cstdlib> #include <cstdlib>
#if !LL_WINDOWS
#include <stdint.h> // uintptr_t #include <stdint.h> // uintptr_t
#endif
#include "llerror.h" #include "llerror.h"

4
indra/newview/lltexturefetch.cpp
View File

@@ -1276,9 +1276,9 @@ bool LLTextureFetchWorker::doWork(S32 param)
// //
static const LLCachedControl<U32> max_http_requests("HTTPMaxRequests", 32); static const LLCachedControl<U32> max_http_requests("HTTPMaxRequests", 32);
static const LLCachedControl<U32> min_http_requests("HTTPMinRequests", 2); static const LLCachedControl<U32> min_http_requests("HTTPMinRequests", 2);
if((mFetcher->getNumHTTPRequests() > max_http_requests) || if(((U32)mFetcher->getNumHTTPRequests() > max_http_requests) ||
((mFetcher->getTextureBandwidth() > mFetcher->mMaxBandwidth) && ((mFetcher->getTextureBandwidth() > mFetcher->mMaxBandwidth) &&
(mFetcher->getNumHTTPRequests() > min_http_requests)) || ((U32)mFetcher->getNumHTTPRequests() > min_http_requests)) ||
!sgConnectionThrottle()) !sgConnectionThrottle())
{ {
return false ; //wait. return false ; //wait.