diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-06-24 10:10:10 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-06-24 10:10:10 -0700 |
| commit | 74634fb9dae5280c5a020b25f027a6f910053feb (patch) | |
| tree | 71fe33062cad04819ba401048241f72812025a04 /indra/newview/lltexturefetch.cpp | |
| parent | a9c281eb57206a0ff7083788e593a22b9f8ad01a (diff) | |
| parent | c7057ef56efc1cca5683ca22e2ad410198d131e8 (diff) | |
Merge with 3.7.10-release
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. |