summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2021-06-29 10:48:02 -0400
committerNat Goodspeed <nat@lindenlab.com>2021-06-29 10:48:02 -0400
commit2e790e9b7250d5f79751fa5287c1993f3fa5c776 (patch)
tree60dd4f9462ba11a4cb7503c64fa1dd2a23373a67 /indra/newview/llviewertexture.cpp
parent1eeb4c85a120b23b853aabb8e6cf984b03dbc17f (diff)
parent467d8339c970c253dada2cf0e1eed45be66593ac (diff)
DRTVWR-538: Merge branch 'master' into c++17
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r--indra/newview/llviewertexture.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 20a22ba45e..ca01bb46aa 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -3314,13 +3314,6 @@ void LLViewerLODTexture::processTextureStats()
{
mDesiredDiscardLevel = llmin(mDesiredDiscardLevel, (S8)mDesiredSavedRawDiscardLevel);
}
- else if(LLPipeline::sMemAllocationThrottled)//release memory of large textures by decrease their resolutions.
- {
- if(scaleDown())
- {
- mDesiredDiscardLevel = mCachedRawDiscardLevel;
- }
- }
}
bool LLViewerLODTexture::scaleDown()