diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:12:26 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:12:26 +0300 |
| commit | 602c9bc04ab5c611bcac51c0c33d5ad34d06a16f (patch) | |
| tree | 064fd9a2d17bfeb052b59a8f737d609cd3d92f86 /indra/newview | |
| parent | c50f96b49215b4279192ffc3eb336a3465a00756 (diff) | |
MAINT-6317 Restored the fix after a conflict resolution
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 93650ddb1a..d7080051da 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -191,6 +191,13 @@ void LLViewerTextureList::doPreloadImages() image->setAddressMode(LLTexUnit::TAM_CLAMP); 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() |