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

Merge branch 'V2Mesh' of git://github.com/Shyotl/SingularityViewer into future

Browse Source 
Conflicts:
	indra/newview/lltexturefetch.cpp
This commit is contained in:
Siana Gearz
2011-08-10 23:21:14 +02:00
parent 2cb0dedbd1 1e7415095c
commit 23c5d5dd48
44 changed files with 1083 additions and 1069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lltexturefetch.cpp
View File

@@ -1144,7 +1144,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
if (region)
{
std::string http_url = region->getCapability("GetTexture");
std::string http_url = region->getHttpUrl() ;
if (!http_url.empty())
{
mUrl = http_url + "/?texture_id=" + mID.asString().c_str();
@@ -1278,7 +1278,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
static const LLCachedControl<S32> min_http_requests("HTTPMinRequests", 2);
if((mFetcher->getNumHTTPRequests() > max_http_requests) ||
((mFetcher->getTextureBandwidth() > mFetcher->mMaxBandwidth) &&
(mFetcher->getNumHTTPRequests() > min_http_requests)) ||
((U32)mFetcher->getNumHTTPRequests() > min_http_requests)) ||
!sgConnectionThrottle())
{
return false ; //wait.
@@ -2348,6 +2348,7 @@ void LLTextureFetch::commonUpdate()
#endif
// Update Curl on same thread as mCurlGetRequest was constructed
llassert_always(mCurlGetRequest);
S32 processed = mCurlGetRequest->process();
if (processed > 0)
{