diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-12-01 15:59:02 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-12-01 15:59:02 +0000 |
| commit | 3f82f7ce3d4fb51407f366b2ad2f15d990de40b2 (patch) | |
| tree | 45be0f3213f0e095d9a7929c693f4671c8b58e08 /indra/newview/llscenemonitor.cpp | |
| parent | 01317a2faded53c79db7e0814426f1d8b2fd12fc (diff) | |
| parent | abd7d80048529fd971e1b65ea3afe0f7e78bd356 (diff) | |
Merged in euclid-pre-16386 (pull request #793)
Purge LLGLSLShader::sNoFixedFunction, and all that flows from it. No functional changes.
Approved-by: Michael Pohoreski
Approved-by: Dave Parks
Diffstat (limited to 'indra/newview/llscenemonitor.cpp')
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 177bc84cee..2e44dc1459 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -271,7 +271,7 @@ void LLSceneMonitor::capture() static LLCachedControl<F32> scene_load_sample_time(gSavedSettings, "SceneLoadingMonitorSampleTime"); static bool force_capture = true; - bool enabled = LLGLSLShader::sNoFixedFunction && (monitor_enabled || mDebugViewerVisible); + bool enabled = monitor_enabled || mDebugViewerVisible; if(mEnabled != enabled) { if(mEnabled) @@ -719,13 +719,6 @@ void LLSceneMonitorView::onTeleportFinished() void LLSceneMonitorView::onVisibilityChange(BOOL visible) { - 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); } |