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

Merged in andreykproductengine/lynx-maint (pull request #12) 

MAINT-6168 Crash in LLViewerParcelMgr::renderParcelCollision()
meow-7.2.2
Andrey Lihatskiy 2016-02-25 17:44:08 +02:00
parent ba8b109e98 696add9fad
commit 9717507cd6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewertexture.h
View File

@ -661,7 +661,7 @@ public:
static LLViewerFetchedTexture* getFetchedTextureFromFile(const std::string& filename,
FTType f_type = FTT_LOCAL_FILE,
BOOL usemipmap = TRUE,
LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,
LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_UI,
S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
LLGLint internal_format = 0,
LLGLenum primary_format = 0,