diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-02-25 17:44:08 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-02-25 17:44:08 +0200 |
| commit | 9717507cd6a13a23ba78a08166d381f0ca1d9d68 (patch) | |
| tree | 5f829d273ef005070a04e4284c6a2757162b5345 /indra/newview | |
| parent | ba8b109e988859757609b6b502bcbc729136a73f (diff) | |
| parent | 696add9fad645bc3bd3fdf686400991e4d0152d0 (diff) | |
Merged in andreykproductengine/lynx-maint (pull request #12)
MAINT-6168 Crash in LLViewerParcelMgr::renderParcelCollision()
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewertexture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index cedac44633..9226774f9a 100755 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -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, |