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/llappearance/lltexlayer.cpp | |
| parent | 80eafe2ff3b235b6355ae2f20e8301374623e6ea (diff) | |
| parent | a5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/llappearance/lltexlayer.cpp')
| -rw-r--r-- | indra/llappearance/lltexlayer.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index 4cf82a3740..63d01999f0 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -1973,10 +1973,7 @@ LLGLTexture* LLTexLayerStaticImageList::getTexture(const std::string& file_name, } else { - if (!gTextureManagerBridgep) - { - return LLPointer<LLGLTexture>(); - } + llassert(gTextureManagerBridgep); tex = gTextureManagerBridgep->getLocalTexture( FALSE ); LLPointer<LLImageRaw> image_raw = new LLImageRaw; if( loadImageRaw( file_name, image_raw ) ) |