MAINT-4155 FIXED Scene Loading Monitor does not open from menu

2 files changed, 16 insertions, 1 deletions

diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index 7f705e44d2..5b37fdf41b 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -711,7 +711,13 @@ void LLSceneMonitorView::onClose(bool app_quitting)
 
 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);
 }
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 01e6c8a5d0..38aaff9279 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -93,6 +93,7 @@
 #include "llparcel.h"
 #include "llrootview.h"
 #include "llsceneview.h"
+#include "llscenemonitor.h"
 #include "llselectmgr.h"
 #include "llspellcheckmenuhandler.h"
 #include "llstatusbar.h"
@@ -534,6 +535,10 @@ class LLAdvancedToggleConsole : public view_listener_t
 		{
 			toggle_visibility( (void*)gSceneView);
 		}
+		else if ("scene monitor" == console_type)
+		{
+			toggle_visibility( (void*)gSceneMonitorView);
+		}
 
 		return true;
 	}
@@ -560,6 +565,10 @@ class LLAdvancedCheckConsole : public view_listener_t
 		{
 			new_value = get_visibility( (void*) gSceneView);
 		}
+		else if ("scene monitor" == console_type)
+		{
+			new_value = get_visibility( (void*) gSceneMonitorView);
+		}
 		
 		return new_value;
 	}