diff options
| author | Dave Parks <davep@lindenlab.com> | 2014-04-16 13:21:06 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2014-04-16 13:21:06 -0500 |
| commit | 816e8578f9b63640afde942df282ccf5ed1385a5 (patch) | |
| tree | 8b229f6311f46b66ce1e4163776438e392593b23 /indra/llappearance/lltexlayer.cpp | |
| parent | 678e8621794e774dc6ecc14b9fc3628583e4b935 (diff) | |
Backed out changeset: d0dfe3cda5b1
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 ) ) |