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

Thu, 25 Feb 2016 17:44:08 +0200

author
Andrey Lihatskiy <andreylproductengine@lindenlab.com>
date
Thu, 25 Feb 2016 17:44:08 +0200
changeset 48897
6eda2cd4ecc3
parent 48895
d30b4fc0df9d
parent 48896
f37d8f257901
child 48898
b4de46ad34b2
child 48905
66e4fbcdc77f

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

MAINT-6168 Crash in LLViewerParcelMgr::renderParcelCollision()

     1.1 --- a/indra/newview/llviewertexture.h	Wed Feb 24 17:40:45 2016 +0200
     1.2 +++ b/indra/newview/llviewertexture.h	Thu Feb 25 17:44:08 2016 +0200
     1.3 @@ -661,7 +661,7 @@
     1.4  	static LLViewerFetchedTexture* getFetchedTextureFromFile(const std::string& filename,									 
     1.5  									 FTType f_type = FTT_LOCAL_FILE,
     1.6  									 BOOL usemipmap = TRUE,
     1.7 -									 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,
     1.8 +									 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_UI,
     1.9  									 S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
    1.10  									 LLGLint internal_format = 0,
    1.11  									 LLGLenum primary_format = 0,

mercurial