diff options
| author | simon <none@none> | 2014-03-26 10:04:53 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-26 10:04:53 -0700 |
| commit | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (patch) | |
| tree | 5dfdbcede0d8c689e796cf65ebc21bb149c17b8e /indra/llrender/llimagegl.cpp | |
| parent | 00a325ccb90b1c6800ec78e1211b5097d9c27a58 (diff) | |
| parent | 5c20e06dbd0845e2d45daae610c43fc89e24028f (diff) | |
Pull in downstream -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(); |