diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-04-03 19:00:13 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-03 19:00:13 -0400 |
| commit | 106864bb8a18f8e4ecc143581af5bb18302b5abf (patch) | |
| tree | 94b940449a997cc6abe64a23b6ca487b4d440909 /indra/newview/llviewertexture.cpp | |
| parent | b724791c2adb3e63c00547c40de2ae1b6ce45b9b (diff) | |
| parent | d1d0a2cf67e3ddd7bd187c63b9ce79e0c19988d6 (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() ; } |