diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 17:06:06 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 19:25:02 +0300 |
| commit | 0dcc912cecdfb365c1f4246545ece40ccb7bc18e (patch) | |
| tree | ccf664c765d1adbbf4985069321df65c85ca36e2 /indra/newview/lldensityctrl.cpp | |
| parent | bd8438f7083643ae5812b14e35e69e69ef1616c6 (diff) | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
Merge main into inventory_favorites
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/newview/lldensityctrl.cpp')
| -rw-r--r-- | indra/newview/lldensityctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldensityctrl.cpp b/indra/newview/lldensityctrl.cpp index 298a309e7c..3997227ef0 100644 --- a/indra/newview/lldensityctrl.cpp +++ b/indra/newview/lldensityctrl.cpp @@ -39,7 +39,7 @@ const std::string LLDensityCtrl::DENSITY_MIE("density_mie"); const std::string LLDensityCtrl::DENSITY_ABSORPTION("density_absorption"); namespace -{ +{ const std::string FIELD_SKY_DENSITY_PROFILE_EXPONENTIAL("level_exponential"); const std::string FIELD_SKY_DENSITY_PROFILE_EXPONENTIAL_SCALE("exponential_scale"); const std::string FIELD_SKY_DENSITY_PROFILE_LINEAR("level_linear"); @@ -151,7 +151,7 @@ void LLDensityCtrl::refresh() getChild<LLSliderCtrl>(FIELD_SKY_DENSITY_MAX_ALTITUDE)->setValue(config[LLSettingsSky::SETTING_DENSITY_PROFILE_WIDTH]); if (mProfileType == Mie) - { + { getChild<LLSliderCtrl>(FIELD_SKY_DENSITY_ANISO_FACTOR)->setValue(config[LLSettingsSky::SETTING_MIE_ANISOTROPY_FACTOR]); } } |