diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-24 14:19:30 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-24 14:19:30 -0700 |
| commit | 7c61728b4bae928b2461f0f933dd1c1fa34ef0aa (patch) | |
| tree | dc43fab3897d0a9b7ae4d4f0625db24596a7ffc5 /indra/newview | |
| parent | 7d2ed8e60668a69e97c58072377273e035022cd2 (diff) | |
MAINT-4952: Removed a bit of debug code that got included accidentally and change host == LLHost() to host.isInvalid()
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 8 | ||||
| -rwxr-xr-x | indra/newview/llviewertexturelist.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 6674532efa..30d90431ea 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1328,11 +1328,11 @@ bool LLTextureFetchWorker::doWork(S32 param) static LLCachedControl<bool> use_http(gSavedSettings, "ImagePipelineUseHTTP", true); -// if (mHost != LLHost()) get_url = false; +// if (mHost.isInvalid()) get_url = false; if ( use_http && mCanUseHTTP && mUrl.empty())//get http url. { LLViewerRegion* region = NULL; - if (mHost == LLHost()) + if (mHost.isInvalid()) region = gAgent.getRegion(); else region = LLWorld::getInstance()->getRegion(mHost); @@ -3224,7 +3224,7 @@ void LLTextureFetch::sendRequestListToSimulators() { LLHost host = iter1->first; // invalid host = use agent host - if (host == LLHost()) + if (host.isInvalid()) { host = gAgent.getRegionHost(); } @@ -3304,7 +3304,7 @@ void LLTextureFetch::sendRequestListToSimulators() iter1 != mCancelQueue.end(); ++iter1) { LLHost host = iter1->first; - if (host == LLHost()) + if (host.isInvalid()) { host = gAgent.getRegionHost(); } diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 0232dcfa15..2fbd9f0acb 100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -236,7 +236,7 @@ void LLViewerTextureList::shutdown() if (!image->hasGLTexture() || !image->getUseDiscard() || image->needsAux() || - image->getTargetHost() != LLHost() || + !image->getTargetHost().isInvalid() || !image->getUrl().empty() ) { |