diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-21 14:47:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-21 14:47:09 -0400 |
| commit | 185aeb2dcc6953b86e25dcb1c3727e7f1255acbc (patch) | |
| tree | 8db1d05fe83754720a54054abf9d4dbebfaadaa9 /indra/newview/llviewertexturelist.cpp | |
| parent | 56ca48390535f543456a0b59365b428198414d4f (diff) | |
| parent | 503dc6ee656bdf579107ff9712ae8e960dd91100 (diff) | |
Merged in ruslantproductengine/ruslanteliuk-391-blizzard (pull request #30)
MAINT-6317 [QuickGraphics-RC] Some rigged mesh attachments render fully on jellybaby avatars when ALM is enabled
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 9ee5ed758f..be80fab8d2 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -184,6 +184,12 @@ void LLViewerTextureList::doPreloadImages() mImagePreloads.insert(image); } + LLPointer<LLImageRaw> img_blak_square_tex(new LLImageRaw(2, 2, 3)); + memset(img_blak_square_tex->getData(), 0, img_blak_square_tex->getDataSize()); + LLPointer<LLViewerFetchedTexture> img_blak_square(new LLViewerFetchedTexture(img_blak_square_tex, FTT_DEFAULT, FALSE)); + gBlackSquareID = img_blak_square->getID(); + img_blak_square->setUnremovable(TRUE); + addImage(img_blak_square, TEX_LIST_DISCARD); } static std::string get_texture_list_name() @@ -854,7 +860,7 @@ void LLViewerTextureList::updateImagesDecodePriorities() LLPointer<LLViewerFetchedTexture> imagep = iter->second; ++iter; // safe to increment now - if(imagep->isInDebug()) + if(imagep->isInDebug() || imagep->isUnremovable()) { update_counter--; continue; //is in debug, ignore. |