diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-19 23:02:37 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-19 23:02:37 +0300 |
| commit | b25a22a2c113a1e95f2cd5d45bb5b80a756c4a80 (patch) | |
| tree | 968ce9657026035901b3604b012f7dff96a2d122 /indra/newview/llviewertexturelist.cpp | |
| parent | 8243301b3ff6c90db6d1fb53baf5050666d75d9a (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r--[-rwxr-xr-x] | 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 5cfd04b4c1..08f6143861 100755..100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -178,6 +178,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_STANDARD); } static std::string get_texture_list_name() @@ -860,7 +866,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. |