diff options
| author | callum_linden <none@none> | 2016-05-06 13:40:29 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-06 13:40:29 -0700 |
| commit | c5d6bfe8ae61e3311c260626b590586d3cde4b6e (patch) | |
| tree | 4b731e4be618f6b9048bcc7e6dadf663f0baec49 /indra/llrender/llgltexture.cpp | |
| parent | 811a0b5726ed965f9f21ace2d3ec97bb95a91311 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/llrender/llgltexture.cpp')
| -rw-r--r-- | indra/llrender/llgltexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp index 56e263c5f1..3a6eebebba 100644 --- a/indra/llrender/llgltexture.cpp +++ b/indra/llrender/llgltexture.cpp @@ -112,7 +112,8 @@ void LLGLTexture::setBoostLevel(S32 level) if(mBoostLevel != level) { mBoostLevel = level ; - if(mBoostLevel != LLGLTexture::BOOST_NONE) + if(mBoostLevel != LLGLTexture::BOOST_NONE + && mBoostLevel != LLGLTexture::BOOST_ICON) { setNoDelete() ; } |