summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-03-06 14:31:31 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-03-06 14:31:31 -0500
commit09a6daabd2c4281b071f9213906872ea8a744956 (patch)
tree0d10bfef2d0a28f68dfd40f6bc3429b6f2e30d1e /indra/newview/lltexturefetch.cpp
parentf70abb4ad628b19c993a22c7e86d350395555fcf (diff)
SL-409 - consolidated user of ViewerAsset cap for mesh and texture fetching as well.
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r--indra/newview/lltexturefetch.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 07b3dc1aa4..7c0d02c9ca 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1351,7 +1351,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
if (region)
{
- std::string http_url = region->getHttpUrl() ;
+ std::string http_url = region->getViewerAssetUrl();
if (!http_url.empty())
{
if (mFTType != FTT_DEFAULT)
@@ -4580,7 +4580,7 @@ void LLTextureFetchDebugger::debugHTTP()
return;
}
- mHTTPUrl = region->getHttpUrl();
+ mHTTPUrl = region->getViewerAssetUrl();
if (mHTTPUrl.empty())
{
LL_INFOS(LOG_TXT) << "Fetch Debugger : Current region URL undefined. Cannot fetch textures through HTTP." << LL_ENDL;