diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-03-21 17:16:13 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-03-21 17:16:13 -0600 |
| commit | ccb8d6f2c59588bcb3b933c98831ee7da74eed03 (patch) | |
| tree | a454cb841e1620abde2c985ed107185353a374d4 /indra | |
| parent | 1f507c3cfca0c7722ebeaf71883fbaa83988e1a9 (diff) | |
| parent | ba54846697aded3a19cb91d53436d3ab26fa0aed (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index c69f276aa2..0145f6f37e 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -511,6 +511,7 @@ void LLSceneMonitorView::onClickCloseBtn() void LLSceneMonitorView::setVisible(BOOL visible) { + visible = visible && LLGLSLShader::sNoFixedFunction; LLSceneMonitor::getInstance()->setDebugViewerVisible(visible); LLView::setVisible(visible); |