livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6317 Restored the fix after a conflict resolution

meow-7.2.2
AndreyL ProductEngine 2016-05-20 02:12:26 +03:00
parent c50f96b492
commit 602c9bc04a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewertexturelist.cpp
View File

@ -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()