aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltexturefetch.cpp')
-rw-r--r--linden/indra/newview/lltexturefetch.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 2184478..5cad14c 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -750,7 +750,9 @@ bool LLTextureFetchWorker::doWork(S32 param)
750 750
751 if (mState == LOAD_FROM_NETWORK) 751 if (mState == LOAD_FROM_NETWORK)
752 { 752 {
753 bool get_url = gSavedSettings.getBOOL("ImagePipelineUseHTTP"); 753 static BOOL* sImagePipelineUseHTTP = rebind_llcontrol<BOOL>("ImagePipelineUseHTTP", &gSavedSettings, true);
754
755 bool get_url = *sImagePipelineUseHTTP;
754 if (!mUrl.empty()) get_url = false; 756 if (!mUrl.empty()) get_url = false;
755// if (mHost != LLHost::invalid) get_url = false; 757// if (mHost != LLHost::invalid) get_url = false;
756 if ( get_url && mCanUseHTTP && mUrl.empty())//get http url. 758 if ( get_url && mCanUseHTTP && mUrl.empty())//get http url.