From 51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 28 Aug 2009 22:30:09 +0000 Subject: 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 --- indra/newview/lltexturectrl.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/lltexturectrl.cpp') 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 ); -- cgit v1.2.3