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

Linux; Make sure GCC is still happy after latest updates.

master
Nicky 2016-06-25 20:18:16 +02:00
parent 98da46eac9
commit 67091be7a4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lldrawpooltree.cpp
View File

@ -99,7 +99,10 @@ void LLDrawPoolTree::render(S32 pass)
LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f);
// [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0)
gGL.getTexUnit(sDiffTex)->bind( (LLPipeline::sRenderTextures) ? mTexturep : LLViewerFetchedTexture::sDefaultDiffuseImagep );
if( (LLPipeline::sRenderTextures) )
gGL.getTexUnit(sDiffTex)->bind( mTexturep );
else
gGL.getTexUnit(sDiffTex)->bind( LLViewerFetchedTexture::sDefaultDiffuseImagep );
// [/SL:KB]
// gGL.getTexUnit(sDiffTex)->bind(mTexturep);

2
indra/newview/rlvactions.cpp
View File

@ -199,6 +199,8 @@ bool RlvActions::canShowName(EShowNamesContext eContext, const LLUUID& idAgent)
case SNC_TELEPORTOFFER:
case SNC_TELEPORTREQUEST:
return gRlvHandler.isException(RLV_BHVR_SHOWNAMES, idAgent);
default:
return false;
}
}
return false;