diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
commit | abb23ff31260e9632406dae03be920a23220d719 (patch) | |
tree | a24029245cf2ca511f3893e1b42e04ac3e9a90db /indra/newview/llviewerparceloverlay.cpp | |
parent | 9d8b189886ae14800d58f9729d8c8ea9b338ed52 (diff) | |
parent | f496c2b164a100836d74909c3e27adcdf98018f0 (diff) |
Manual merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerparceloverlay.cpp')
-rw-r--r-- | indra/newview/llviewerparceloverlay.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp index 9896adad97..9de1ef7190 100644 --- a/indra/newview/llviewerparceloverlay.cpp +++ b/indra/newview/llviewerparceloverlay.cpp @@ -808,6 +808,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines () S32 drawn = 0; F32* vertexp; U8* colorp; + bool render_hidden = LLSelectMgr::sRenderHiddenSelections && LLFloaterReg::instanceVisible("build"); const F32 PROPERTY_LINE_CLIP_DIST = 256.f; @@ -849,7 +850,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines () gGL.end(); - if (LLSelectMgr::sRenderHiddenSelections && LLFloaterReg::instanceVisible("build")) + if (render_hidden) { LLGLDepthTest depth(GL_TRUE, GL_FALSE, GL_GREATER); |