diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 09:43:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 09:43:04 -0400 |
| commit | fc71a9c1ed96cb1cb97124e3cceabdfa11e1cc75 (patch) | |
| tree | b8e19975b3acc800aeaf8c541a780dbb84dc1fd3 /indra/newview/llfloatereditsky.cpp | |
| parent | a3cbd41543258818589dd0e368c68d2dc62b3398 (diff) | |
| parent | 5e40b5e64433b224be4dc220e4496dcd0a43f3f6 (diff) | |
Merge release/maint-yz to main on promotion of secondlife/viewer #736: Maintenance YZ 7.1.6.8745209917
Diffstat (limited to 'indra/newview/llfloatereditsky.cpp')
| -rw-r--r-- | indra/newview/llfloatereditsky.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatereditsky.cpp b/indra/newview/llfloatereditsky.cpp index 2d5e86869d..fa51143f3a 100644 --- a/indra/newview/llfloatereditsky.cpp +++ b/indra/newview/llfloatereditsky.cpp @@ -84,7 +84,7 @@ BOOL LLFloaterEditSky::postBuild() mSkyPresetCombo = getChild<LLComboBox>("sky_preset_combo"); mMakeDefaultCheckBox = getChild<LLCheckBoxCtrl>("make_default_cb"); mSaveButton = getChild<LLButton>("save"); - mSkyAdapter = boost::make_shared<LLSkySettingsAdapter>(); + mSkyAdapter = std::make_shared<LLSkySettingsAdapter>(); LLEnvironment::instance().setSkyListChange(boost::bind(&LLFloaterEditSky::onSkyPresetListChange, this)); |