diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-04-05 15:24:22 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-05 15:24:22 -0400 |
| commit | 3e53ade13e7c9e70ba67a1e845696712081f7651 (patch) | |
| tree | c77ef8c210581c3b3852aeba205e8a5666c803a9 /indra/newview/llviewertexture.cpp | |
| parent | 323a2f2235a52383bcfbae79bdce9e61ca808d2a (diff) | |
| parent | 37303b9a2b58e3f66d246a0f4d2e6072eabcba86 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 236b95253c..eb6c453e76 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -911,6 +911,10 @@ LLViewerFetchedTexture::LLViewerFetchedTexture(const LLUUID& id, FTType f_type, { init(TRUE) ; mFTType = f_type; + if (mFTType == FTT_HOST_BAKE) + { + mCanUseHTTP = false; + } generateGLTexture() ; } |