Fix tex format mismatch between what libatmosphere was generating and what we were claiming to use in rendering.

First pass at sky shader using libatmosphere sky radiance lookup.

Add atmo density controls to ext daycycle floater tabs.

1 files changed, 10 insertions, 6 deletions

diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index d38098c0a6..1104717dc1 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -55,6 +55,8 @@
 #include "llsettingsvo.h"
 #include "llinventorymodel.h"
 
+extern LLControlGroup gSavedSettings;
+
 namespace
 {
     const std::string FIELD_SETTINGS_NAME("settings_name");
@@ -599,12 +601,14 @@ BOOL LLFloaterFixedEnvironmentSky::postBuild()
     panel->setOnDirtyFlagChanged([this](LLPanel *, bool value) { onPanelDirtyFlagChanged(value); });
     mTab->addTabPanel(LLTabContainer::TabPanelParams().panel(panel).select_tab(false));
 
-    panel = new LLPanelSettingsSkyDensityTab;
-    panel->buildFromFile("panel_settings_sky_density.xml");
-    panel->setSky(std::static_pointer_cast<LLSettingsSky>(mSettings));
-    panel->setOnDirtyFlagChanged([this](LLPanel *, bool value) { onPanelDirtyFlagChanged(value); });
-    mTab->addTabPanel(LLTabContainer::TabPanelParams().panel(panel).select_tab(false));
-
+    if (gSavedSettings.getBOOL("RenderUseAdvancedAtmospherics"))
+    {
+        panel = new LLPanelSettingsSkyDensityTab;
+        panel->buildFromFile("panel_settings_sky_density.xml");
+        panel->setSky(std::static_pointer_cast<LLSettingsSky>(mSettings));
+        panel->setOnDirtyFlagChanged([this](LLPanel *, bool value) { onPanelDirtyFlagChanged(value); });
+        mTab->addTabPanel(LLTabContainer::TabPanelParams().panel(panel).select_tab(false));
+    }
     return TRUE;
 }