diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-22 17:50:17 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-22 17:50:17 +0200 |
| commit | a68935b94fea5e07cd9ae2d9e697cf0a632e682d (patch) | |
| tree | ec2e05dc583ef547aef966bf6100f2a5c50e31b0 /indra/newview/lltexturectrl.cpp | |
| parent | 191e5f9ca033cd1520950f35309c0bc2c4499803 (diff) | |
| parent | 754801f66942b0e9ec5ab4278dacb034fd23a0dd (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 5f7c2f5080..25e5e23e6f 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1237,6 +1237,7 @@ void LLTextureCtrl::draw() // Using the discard level, do not show the string if the texture is almost but not // fully loaded. if ( mTexturep.notNull() && + (!mTexturep->isFullyLoaded()) && (mShowLoadingPlaceholder == TRUE) && (mTexturep->getDiscardLevel() != 1) && (mTexturep->getDiscardLevel() != 0)) |