diff options
| author | simon <none@none> | 2014-04-21 13:04:07 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 13:04:07 -0700 |
| commit | fdb28bccb92d121f1b3dfc068a50d5cc3db43ce9 (patch) | |
| tree | 391f32cc407d6e9c14bd4804b7ece4f53df3250c /indra/llrender/llimagegl.cpp | |
| parent | 80eafe2ff3b235b6355ae2f20e8301374623e6ea (diff) | |
| parent | a5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rwxr-xr-x | indra/llrender/llimagegl.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 315cc57e51..ab875141c5 100755 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1251,11 +1251,6 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S return FALSE; } - if (!imageraw->getData()) - { - return FALSE; - } - mGLTextureCreated = false ; llassert(gGLManager.mInited); stop_glerror(); |