diff options
| author | simon <none@none> | 2014-04-21 12:48:50 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 12:48:50 -0700 |
| commit | a5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (patch) | |
| tree | 0b58bf76487dca0bc439d1f99cd568f970b9cc32 /indra/llappearance | |
| parent | 114084bb80d4991519e2ca4020823319810c64b2 (diff) | |
| parent | 0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (diff) | |
Merge downstream code
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/lltexlayer.cpp | 5 | ||||
| -rw-r--r-- | indra/llappearance/llwearable.cpp | 11 |
2 files changed, 2 insertions, 14 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 ) ) diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp index 61cd995cea..d86a460511 100644 --- a/indra/llappearance/llwearable.cpp +++ b/indra/llappearance/llwearable.cpp @@ -420,12 +420,6 @@ LLWearable::EImportResult LLWearable::importStream( std::istream& input_stream, return LLWearable::FAILURE; } LLUUID id = LLUUID(uuid_buffer); - - if (!gTextureManagerBridgep) - { - continue; - } - LLGLTexture* image = gTextureManagerBridgep->getFetchedTexture( id ); if( mTEMap.find(te) != mTEMap.end() ) { @@ -598,10 +592,7 @@ void LLWearable::syncImages(te_map_t &src, te_map_t &dst) { // there is no Local Texture Object in the source image map. Get defaults values for populating the destination image map. image_id = getDefaultTextureImageID((ETextureIndex) te); - if (gTextureManagerBridgep) - { - image = gTextureManagerBridgep->getFetchedTexture( image_id ); - } + image = gTextureManagerBridgep->getFetchedTexture( image_id ); } if( dst.find(te) != dst.end() ) |