summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-10-28 11:02:33 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-10-28 11:02:33 -0600
commit854aec1231ff3bd579ae6aec2302c8f9e1d7d958 (patch)
tree141300e9baed3fca603d807c5f02de60b34daeb2 /indra/newview/llviewertexture.cpp
parentdba221e0ac89b1505ddd3b896946286d5d1cf3d8 (diff)
a try to fix the blurry texture problem.
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rwxr-xr-xindra/newview/llviewertexture.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 1f42590884..f22074a8d6 100755
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1889,7 +1889,7 @@ bool LLViewerFetchedTexture::updateFetch()
if ((decode_priority > 0) && (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL))
{
// We finished but received no data
- if (current_discard < 0)
+ if (getDiscardLevel() < 0)
{
if (getFTType() != FTT_MAP_TILE)
{
@@ -1906,8 +1906,17 @@ bool LLViewerFetchedTexture::updateFetch()
else
{
//llwarns << mID << ": Setting min discard to " << current_discard << llendl;
- mMinDiscardLevel = current_discard;
- desired_discard = current_discard;
+ if(current_discard >= 0)
+ {
+ mMinDiscardLevel = current_discard;
+ desired_discard = current_discard;
+ }
+ else
+ {
+ S32 dis_level = getDiscardLevel();
+ mMinDiscardLevel = dis_level;
+ desired_discard = dis_level;
+ }
}
destroyRawImage();
}