summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterfixedenvironment.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-08-29 21:13:09 +0100
committerGraham Linden <graham@lindenlab.com>2018-08-29 21:13:09 +0100
commit964a472461bed91b3efa383aaea34d425b96111d (patch)
treebce20c3fc0c6e7f34679e8621212ab45ad238a4b /indra/newview/llfloaterfixedenvironment.cpp
parentcb00370c4ac3722d9962db502fc15cdd0efffe10 (diff)
Hook up sky density panel to fixedenv and edit_ext_daycycle UI.
Fix retrieving LLSD for density configs (element not array) in density UI. Tweak layout of sky density controls.
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
-rw-r--r--indra/newview/llfloaterfixedenvironment.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index ece4898935..7ff1663942 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -596,6 +596,12 @@ 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));
+
return TRUE;
}