diff options
author | andreykproductengine <akleshchev@productengine.com> | 2014-07-23 18:29:18 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2014-07-23 18:29:18 +0300 |
commit | f69b11691d9911264d42a9c53d407a808591ee7c (patch) | |
tree | 97d2165e9d969c601d2bed04968159b8f3136c8c /indra | |
parent | bc029b770c92f9443a30fee88d3b7a22b971b643 (diff) |
MAINT-4283 FIXED [BEAR] Viewer always crashes when opening "Scene Loading Monitor" if you closed it previously with the X
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llscenemonitor.cpp | 5 | ||||
-rw-r--r-- | indra/newview/llscenemonitor.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 5b37fdf41b..179a73413e 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -709,6 +709,11 @@ void LLSceneMonitorView::onClose(bool app_quitting) setVisible(false); } +void LLSceneMonitorView::onClickCloseBtn(bool app_quitting) +{ + setVisible(false); +} + void LLSceneMonitorView::onVisibilityChange(BOOL visible) { if (!LLGLSLShader::sNoFixedFunction && visible) diff --git a/indra/newview/llscenemonitor.h b/indra/newview/llscenemonitor.h index e9ceb2aa2a..5bde3b5aab 100644 --- a/indra/newview/llscenemonitor.h +++ b/indra/newview/llscenemonitor.h @@ -116,6 +116,7 @@ public: protected: virtual void onClose(bool app_quitting=false); + virtual void onClickCloseBtn(bool app_quitting=false); }; extern LLSceneMonitorView* gSceneMonitorView; |