diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-06 11:00:47 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-06 11:00:47 -0400 |
| commit | 2d8b53854ebc1db5cceda1e1b5d6abbbc6c08728 (patch) | |
| tree | 56388b12b66b42059841faeadac6f110abc18d21 /indra/llrender/llgltexture.cpp | |
| parent | e0cb5438a5055c71191c6ae6b27c7dee63e40562 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
merge
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() ; } |