diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-09-19 10:54:55 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-09-19 10:54:55 -0700 |
| commit | c25a7866408d8590b7e9672d019089cb1358dbce (patch) | |
| tree | 22c361d0b9647c74813fda9cffd75617036cef17 /indra/newview/llscenemonitor.cpp | |
| parent | 9ae872da5996d6c7d1f35fbf5f5c6edc75fae3c5 (diff) | |
| parent | 951c83724d7e364ac52cbee2d657711fda7d2c26 (diff) | |
Pulled merge from viewer-tiger
Diffstat (limited to 'indra/newview/llscenemonitor.cpp')
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 7f705e44d2..179a73413e 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -709,9 +709,20 @@ void LLSceneMonitorView::onClose(bool app_quitting) setVisible(false); } +void LLSceneMonitorView::onClickCloseBtn(bool app_quitting) +{ + setVisible(false); +} + void LLSceneMonitorView::onVisibilityChange(BOOL visible) { - visible = visible && LLGLSLShader::sNoFixedFunction; + if (!LLGLSLShader::sNoFixedFunction && visible) + { + visible = false; + // keep Scene monitor and its view in sycn + setVisible(false); + LL_WARNS("SceneMonitor") << "Incompatible graphical settings, Scene Monitor can't be turned on" << LL_ENDL; + } LLSceneMonitor::getInstance()->setDebugViewerVisible(visible); } |