diff options
| author | James Cook <james@lindenlab.com> | 2009-12-29 11:55:20 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-29 11:55:20 -0800 |
| commit | c2915a889987e64484c9794d55740e7f6ac8f9bd (patch) | |
| tree | e09a6050829fbc4b1f8fdae03f6c12742ba903ed /indra/newview/lltexturectrl.cpp | |
| parent | 1e9a5c21e5493ad3dabec4d032bc0a627e2f725f (diff) | |
| parent | 3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (diff) | |
Merge viewer-2-0 into gooey
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)) |