diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
| commit | 8897e7ca24533e0093825346391f5fa9a37f2427 (patch) | |
| tree | 781b08a7a90e53124d4f11b507be4d726544f0f0 /indra/newview/llscenemonitor.cpp | |
| parent | 79ab7c20703c092a4416a4f9a885e0246fc17ee0 (diff) | |
| parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) | |
Merge. Refresh from viewer-release after 3.7.16 release.
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); } |