Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics

2013-03-21 17:16:13 -06:00 · 2013-03-21 17:16:13 -06:00 · ccb8d6f2c5
parent 1f507c3cfc ba54846697
commit ccb8d6f2c5
1 changed files with 1 additions and 0 deletions
--- 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);