diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-23 15:17:05 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-23 15:17:05 -0500 |
| commit | ce86efac3df1ed568ecac0ffcf38dce94bb3f1d4 (patch) | |
| tree | bd5d26c2e44bc9e03921c8e82029b20fabd0b4c5 /indra/newview/lltexturectrl.cpp | |
| parent | 5c8b2deb82cfe753d6fe25e418f99f05d76e0b73 (diff) | |
| parent | 3a852170556cd4104dc7822140533d81d46b644d (diff) | |
merge
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)) |