From 961d52fbd3d8f5cc14aad2da93455e9e21873793 Mon Sep 17 00:00:00 2001 From: "Graham Madarasz (Graham Linden)" Date: Mon, 1 Apr 2013 12:31:20 -0700 Subject: NORSPEC-47 alpha mode enabled for textures without alpha channels --- indra/newview/llpanelface.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 754a13dd4c..0d7b4b88c9 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -694,7 +694,24 @@ void LLPanelFace::getState() } } func2; identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func2, image_format ); - mIsAlpha = image_format != GL_RGB; + + mIsAlpha = FALSE; + switch (image_format) + { + case GL_RGBA: + case GL_ALPHA: + { + mIsAlpha = TRUE; + } + break; + + case GL_RGB: break; + default: + { + llwarns << "Unexpected tex format in LLPanelFace...resorting to no alpha" << llendl; + } + break; + } if(LLViewerMedia::textureHasMedia(id)) { -- cgit v1.2.3 From 4bbb21ec2d8143064887365a43e1b9fbb0800fd3 Mon Sep 17 00:00:00 2001 From: "Graham Madarasz (Graham Linden)" Date: Mon, 1 Apr 2013 12:58:14 -0700 Subject: NORSPEC-23 tex box fails to indicate multiple textures in use --- indra/newview/llpanelface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 0d7b4b88c9..38a45ff4ce 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -693,7 +693,7 @@ void LLPanelFace::getState() return image_format; } } func2; - identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func2, image_format ); + identical &= LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func2, image_format ); mIsAlpha = FALSE; switch (image_format) -- cgit v1.2.3 From 7c242dae7349f8a5857b1bde33320f6f37987acf Mon Sep 17 00:00:00 2001 From: "Graham Madarasz (Graham Linden)" Date: Mon, 1 Apr 2013 13:27:25 -0700 Subject: Fix Mac startup crash on unbind cube map if RenderDebugGL is on --- indra/newview/lldrawpoolbump.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 1b0b11298c..8d1db7b9ad 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -449,9 +449,6 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32& LLCubeMap* cube_map = gSky.mVOSkyp ? gSky.mVOSkyp->getCubeMap() : NULL; if( cube_map ) { - cube_map->disable(); - cube_map->restoreMatrix(); - if (!invisible && shader_level > 1) { shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP); @@ -464,6 +461,8 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32& } } } + cube_map->disable(); + cube_map->restoreMatrix(); } if (!LLGLSLShader::sNoFixedFunction) -- cgit v1.2.3 From 8037601dedbe9e0a3f1e588b6109bbad6adb1cff Mon Sep 17 00:00:00 2001 From: "Graham Madarasz (Graham Linden)" Date: Mon, 1 Apr 2013 14:07:12 -0700 Subject: Remove duplicate fwrite of viewer stats data --- indra/newview/llviewerstatsrecorder.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp index 97ca08f694..728f04af78 100644 --- a/indra/newview/llviewerstatsrecorder.cpp +++ b/indra/newview/llviewerstatsrecorder.cpp @@ -258,7 +258,6 @@ void LLViewerStatsRecorder::writeToLog( F32 interval ) { llwarns << "Unable to write complete stats record to " << STATS_FILE_NAME << llendl; } - fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile ); clearStats(); } -- cgit v1.2.3