diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
| commit | 51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 (patch) | |
| tree | 2ed65f1dd0a8404eda670cf1fe2e37769758f74a /indra/newview/lltexturectrl.cpp | |
| parent | b2b980d6979b10a08b56c10b71c12ae4f9e6ff59 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3
* EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 3c7a8d757b..1b47fa43c7 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1197,6 +1197,10 @@ void LLTextureCtrl::draw() mTexturep = LLViewerTextureManager::getFetchedTextureFromFile(mFallbackImageName); mTexturep->setBoostLevel(LLViewerTexture::BOOST_PREVIEW); } + else//mImageAssetID == LLUUID::null + { + mTexturep = NULL; + } // Border LLRect border( 0, getRect().getHeight(), getRect().getWidth(), BTN_HEIGHT_SMALL ); |