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

Merge viewer-cougar

meow-7.2.2
Ansariel 2018-06-25 23:00:46 +02:00
parent 5e4fa5e117 21f19cb6f0
commit abb1d8696a
7 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -222,6 +222,7 @@ Ansariel Hiller
MAINT-6917
MAINT-8085
STORM-2122
MAINT-8723
Aralara Rajal
Arare Chantilly
CHUIBUG-191

2
indra/newview/llhudeffectlookat.cpp
View File

@ -564,7 +564,7 @@ void LLHUDEffectLookAt::render()
if ((hide_own || is_private) && ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->isSelf())
return;
LLGLDisable gls_stencil(GL_STENCIL_TEST); // <FS:Ansariel> HUD items hidden by new mesh selection outlining
LLGLDisable gls_stencil(GL_STENCIL_TEST);
LLVector3 target = mTargetPos + ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->mHeadp->getWorldPosition();
LLColor3 lookAtColor = (*mAttentions)[mTargetType].mColor;

2
indra/newview/llhudeffectpointat.cpp
View File

@ -346,7 +346,7 @@ void LLHUDEffectPointAt::render()
update();
if (sDebugPointAt && mTargetType != POINTAT_TARGET_NONE)
{
LLGLDisable gls_stencil(GL_STENCIL_TEST); // <FS:Ansariel> HUD items hidden by new mesh selection outlining
LLGLDisable gls_stencil(GL_STENCIL_TEST);
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
LLVector3 target = mTargetPos + mSourceObject->getRenderPosition();

2
indra/newview/llhudicon.cpp
View File

@ -85,7 +85,7 @@ void LLHUDIcon::renderIcon(BOOL for_select)
{
LLGLSUIDefault texture_state;
LLGLDepthTest gls_depth(GL_TRUE);
LLGLDisable gls_stencil(GL_STENCIL_TEST); // <FS:Ansariel> HUD items hidden by new mesh selection outlining
LLGLDisable gls_stencil(GL_STENCIL_TEST);
if (for_select)
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);

2
indra/newview/llhudnametag.cpp
View File

@ -229,7 +229,7 @@ void LLHUDNameTag::render()
if (sDisplayText)
{
LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
LLGLDisable gls_stencil(GL_STENCIL_TEST); // <FS:Ansariel> HUD items hidden by new mesh selection outlining
LLGLDisable gls_stencil(GL_STENCIL_TEST);
renderText(FALSE);
}
}

2
indra/newview/llhudtext.cpp
View File

@ -109,7 +109,7 @@ void LLHUDText::render()
if (!mOnHUDAttachment && sDisplayText)
{
LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
LLGLDisable gls_stencil(GL_STENCIL_TEST); // <FS:Ansariel> HUD items hidden by new mesh selection outlining
LLGLDisable gls_stencil(GL_STENCIL_TEST);
renderText();
}
}

2
indra/newview/llvoicevisualizer.cpp
View File

@ -356,7 +356,7 @@ void LLVoiceVisualizer::render()
//---------------------------------------------------------------
LLGLSPipelineAlpha alpha_blend;
LLGLDepthTest depth(GL_TRUE, GL_FALSE);
LLGLDisable gls_stencil(GL_STENCIL_TEST); // <FS:Ansariel> HUD items hidden by new mesh selection outlining
LLGLDisable gls_stencil(GL_STENCIL_TEST);
//-------------------------------------------------------------
// create coordinates of the geometry for the dot