diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-30 19:45:51 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-30 19:45:51 -0700 |
| commit | c77ef359c35bd1467a1d024486767ac560bc1e6a (patch) | |
| tree | 38ef6d428b4b58e530c6044bcf0b50358e77f3c2 /indra | |
| parent | c780f730fed7ed90bf7228fd42e9ea46b8bce1cc (diff) | |
Retropedaling on SH-4030 fix that crashes my viewer on loggin
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 14a42dd8dc..5a120d099e 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2593,7 +2593,7 @@ 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) && !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. |