summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-06-17 15:43:51 -0700
committerMerov Linden <merov@lindenlab.com>2014-06-17 15:43:51 -0700
commit7d7d04269106d9cd582023df075c4c2f8ea66f1e (patch)
tree606f5c0237144bd4ef16ea8b93f21df14d4a7897 /indra
parente3e1a527ccbab17e140f91267c847d7e799dbe6f (diff)
Retropedaling on SH-4030 fix that crashes my viewer on loggin
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/lltexturefetch.cpp3
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.