diff options
| author | simon <none@none> | 2014-06-24 10:06:28 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-06-24 10:06:28 -0700 |
| commit | 05319e6c94f7975281ed38c322f5d1e3bcd3e211 (patch) | |
| tree | 74e41a15540d61fcba82241c70a7734c8d919111 /indra/newview/lltexturefetch.cpp | |
| parent | 190f66ab78e6a2df15e91e80d9863dcc8f030a2c (diff) | |
| parent | 527f180dd74d83e478d68402626ca23341cc42e6 (diff) | |
Pull downstream viewer-tiger and become version 3.7.11
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 14a42dd8dc..9ea46cab68 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2593,7 +2593,8 @@ bool LLTextureFetch::createRequest(FTType f_type, const std::string& url, const S32 desired_size; std::string exten = gDirUtilp->getExtension(url); - if (f_type == FTT_SERVER_BAKE) + //if (f_type == FTT_SERVER_BAKE) + if ((f_type == FTT_SERVER_BAKE) && !url.empty() && !exten.empty() && (LLImageBase::getCodecFromExtension(exten) != IMG_CODEC_J2C)) { // SH-4030: This case should be redundant with the following one, just // breaking it out here to clarify that it's intended behavior. |