From 3fc38675b849b798cda16645b3ca12d099588032 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Tue, 10 May 2016 13:43:27 +0200 Subject: [PATCH 1/3] Updated Polish translation --- .../newview/skins/default/xui/pl/panel_preferences_firestorm.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml index 5482571980..34fbcf9065 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml @@ -85,6 +85,7 @@ (Śledzenie spojrzeń Awatara w zakładce Prywatność) + Efekty wiązki wyboru From 69ea12c030b92875e184a03f0b162ed693eda2e9 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Wed, 11 May 2016 18:13:12 -0500 Subject: [PATCH 2/3] BUG-11562: Reinstalling Nicky's fix since LL's fix won't be along for a while --- indra/newview/lldrawpoolterrain.cpp | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 764d49b1c0..75b0d75e7f 100755 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -57,6 +57,38 @@ F32 LLDrawPoolTerrain::sDetailScale = DETAIL_SCALE; static LLGLSLShader* sShader = NULL; static LLTrace::BlockTimerStatHandle FTM_SHADOW_TERRAIN("Terrain Shadow"); +// Hack to preload the invisiprim textures and make them fall into the right texturelist bucket + +LLPointer mAlphaRampImagep2; +LLPointer m2DAlphaRampImagep2; + +void preloadForInvisiprims() +{ + U32 format = GL_ALPHA8; + U32 int_format = GL_ALPHA; + mAlphaRampImagep2 = LLViewerTextureManager::getFetchedTextureFromFile( "alpha_gradient.tga", + FTT_LOCAL_FILE, + TRUE, LLGLTexture::BOOST_NONE, + LLViewerTexture::FETCHED_TEXTURE, + format, int_format, + LLUUID( "e97cf410-8e61-7005-ec06-629eba4cd1fb" ) ); + + //gGL.getTexUnit(0)->bind(mAlphaRampImagep.get()); + mAlphaRampImagep2->setAddressMode( LLTexUnit::TAM_CLAMP ); + + m2DAlphaRampImagep2 = LLViewerTextureManager::getFetchedTextureFromFile( "alpha_gradient_2d.j2c", + FTT_LOCAL_FILE, + TRUE, LLGLTexture::BOOST_NONE, + LLViewerTexture::FETCHED_TEXTURE, + format, int_format, + LLUUID( "38b86f85-2575-52a9-a531-23108d8da837" ) ); + + //gGL.getTexUnit(0)->bind(m2DAlphaRampImagep.get()); + m2DAlphaRampImagep2->setAddressMode( LLTexUnit::TAM_CLAMP ); + +} +// + LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerTexture *texturep) : LLFacePool(POOL_TERRAIN), @@ -99,6 +131,8 @@ LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerTexture *texturep) : mTexturep->setBoostLevel(LLGLTexture::BOOST_TERRAIN); //gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); + + preloadForInvisiprims(); // load textures for invisiprims (same UUID as above, but put them into the texturelist for normal textures rather than UI). } LLDrawPoolTerrain::~LLDrawPoolTerrain() From fe14a23bbce87129f28c02bde4e6fdf508c39942 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Wed, 11 May 2016 21:42:52 -0500 Subject: [PATCH 3/3] BUG-11933: Ignore invisiprim textures in saved texture list. --- indra/newview/llviewertexture.cpp | 25 +++++++++++++++++++++++++ indra/newview/llviewertexture.h | 4 ++++ indra/newview/llviewertexturelist.cpp | 5 +++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 640ad962c0..b896a9bb44 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -126,6 +126,11 @@ const F32 desired_discard_bias_min = -2.0f; // -max number of levels to improve const F32 desired_discard_bias_max = (F32)MAX_DISCARD_LEVEL; // max number of levels to reduce image quality by const F64 log_2 = log(2.0); +LLUUID LLViewerTexture::sInvisiprimTexture1 = LLUUID::null; +LLUUID LLViewerTexture::sInvisiprimTexture2 = LLUUID::null; +#define TEX_INVISIPRIM1 "e97cf410-8e61-7005-ec06-629eba4cd1fb" +#define TEX_INVISIPRIM2 "38b86f85-2575-52a9-a531-23108d8da837" + //---------------------------------------------------------------------------------------------- //namespace: LLViewerTextureAccess //---------------------------------------------------------------------------------------------- @@ -479,6 +484,15 @@ void LLViewerTexture::initClass() { sTexelPixelRatio = gSavedSettings.getF32("TexelPixelRatio"); } + + if (sInvisiprimTexture1.isNull()) + { + sInvisiprimTexture1 = LLUUID(TEX_INVISIPRIM1); + } + if (sInvisiprimTexture2.isNull()) + { + sInvisiprimTexture2 = LLUUID(TEX_INVISIPRIM2); + } } // tuning params @@ -1030,6 +1044,17 @@ BOOL LLViewerTexture::isLargeImage() return (S32)mTexelsPerImage > LLViewerTexture::sMinLargeImageSize; } +bool LLViewerTexture::isInvisiprim() +{ + return isInvisiprim(mID); +} + +//static +bool LLViewerTexture::isInvisiprim(LLUUID id) +{ + return (id == sInvisiprimTexture1) || (id == sInvisiprimTexture2); +} + //virtual void LLViewerTexture::updateBindStatsForTester() { diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 030c628a74..55f1767c8f 100755 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -164,6 +164,8 @@ public: virtual void setCachedRawImage(S32 discard_level, LLImageRaw* imageraw) ; BOOL isLargeImage() ; + bool isInvisiprim() ; + static bool isInvisiprim(LLUUID id) ; void setParcelMedia(LLViewerMediaTexture* media) {mParcelMedia = media;} BOOL hasParcelMedia() const { return mParcelMedia != NULL;} @@ -236,6 +238,8 @@ public: static S32 sMaxSmallImageSize ; static BOOL sFreezeImageScalingDown ;//do not scale down image res if set. static F32 sCurrentTime ; + static LLUUID sInvisiprimTexture1 ; + static LLUUID sInvisiprimTexture2 ; enum EDebugTexels { diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index ab89e822a9..d1a753507d 100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -228,7 +228,7 @@ void LLViewerTextureList::doPrefetchImages() S32 pixel_area = imagesd["area"]; S32 texture_type = imagesd["type"]; - if(LLViewerTexture::FETCHED_TEXTURE == texture_type || LLViewerTexture::LOD_TEXTURE == texture_type) + if((LLViewerTexture::FETCHED_TEXTURE == texture_type || LLViewerTexture::LOD_TEXTURE == texture_type) && !LLViewerTexture::isInvisiprim(uuid)) { LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(uuid, FTT_DEFAULT, MIPMAP_TRUE, LLGLTexture::BOOST_NONE, texture_type); if (image) @@ -263,7 +263,8 @@ void LLViewerTextureList::shutdown() !image->getUseDiscard() || image->needsAux() || image->getTargetHost() != LLHost::invalid || - !image->getUrl().empty() + !image->getUrl().empty() || + image->isInvisiprim() ) { continue; // avoid UI, baked, and other special images