From ba54846697aded3a19cb91d53436d3ab26fa0aed Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 14 Mar 2013 20:54:28 -0600 Subject: for SH-3968: Rendering issues when scene loading monitoring code disabled on Mac. --- indra/newview/llscenemonitor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 189697dcf0..82ab90e325 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -410,6 +410,7 @@ void LLSceneMonitorView::onClickCloseBtn() void LLSceneMonitorView::setVisible(BOOL visible) { + visible = visible && LLGLSLShader::sNoFixedFunction; LLSceneMonitor::getInstance()->setDebugViewerVisible(visible); LLView::setVisible(visible); -- cgit v1.2.3