diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-12-22 15:37:31 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-12-22 15:37:31 -0500 |
| commit | 53698d5c10a868abd883a0a4b4222d2e2d4bab96 (patch) | |
| tree | 9a4c50e17c4d8e0de094c4352ec9df5944240c02 /indra/newview/lltexturectrl.cpp | |
| parent | 616ca198143e7cc3f925add2c3b83aaf5d2fe244 (diff) | |
| parent | 0a98034641267ea57360fdd369acb8b94ff9bc20 (diff) | |
automated merge PE->viewer2.0
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)) |