summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2018-08-16 18:32:34 +0300
committerruslantproductengine <ruslantproductengine@lindenlab.com>2018-08-16 18:32:34 +0300
commit8a352faeae571d2ff800770070265f41a33525d9 (patch)
tree90dd3fb3ecbeeb45f4fc85ec2841f389a6eef039 /indra
parent3983f5b1e2d79602a7d685633271d824a906ed2f (diff)
MAINT-8937 - Selection Outline Odd Behavior When Panning Around
Fixed.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llselectmgr.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 245d248390..8ec1d0e9f7 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6317,7 +6317,9 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color)
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
- if (LLSelectMgr::sRenderHiddenSelections) // && gFloaterTools && gFloaterTools->getVisible())
+ bool wireframe_selection = gFloaterTools && gFloaterTools->getVisible() || LLSelectMgr::sRenderHiddenSelections;
+
+ if (LLSelectMgr::sRenderHiddenSelections)
{
gGL.blendFunc(LLRender::BF_SOURCE_COLOR, LLRender::BF_ONE);
LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GEQUAL);
@@ -6350,8 +6352,6 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color)
gGL.diffuseColor4f(color.mV[VRED] * 2, color.mV[VGREEN] * 2, color.mV[VBLUE] * 2, LLSelectMgr::sHighlightAlpha * 2);
{
- bool wireframe_selection = gFloaterTools && gFloaterTools->getVisible();
-
LLGLDisable depth(wireframe_selection ? 0 : GL_BLEND);
LLGLEnable stencil(wireframe_selection ? 0 : GL_STENCIL_TEST);