diff options
| author | simon <none@none> | 2014-03-26 10:08:19 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-26 10:08:19 -0700 |
| commit | 70006f4a5651ebaa0362ec2f95b5dda13f72e5c7 (patch) | |
| tree | 6e1f7e8ccea28fa830bca7f2508a626f6ca907c9 /indra/llrender/llimagegl.cpp | |
| parent | 73ef75498692e7b7cecb4960f4e308061917d86e (diff) | |
| parent | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (diff) | |
Pull in downstream -tiger, -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rwxr-xr-x | indra/llrender/llimagegl.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index ab875141c5..315cc57e51 100755 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1251,6 +1251,11 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S return FALSE; } + if (!imageraw->getData()) + { + return FALSE; + } + mGLTextureCreated = false ; llassert(gGLManager.mInited); stop_glerror(); |