diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-04 16:08:41 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-04 16:08:41 +0300 |
| commit | 5c5dd99b3865b958ce963a8d84f0bbae3728512f (patch) | |
| tree | 68d0bb320fd8210a0406a090dc137c96683822d8 /indra/newview/llfloatereditsky.cpp | |
| parent | 1444c4a23cb0167002dd398a16cfc78a72e43e03 (diff) | |
| parent | e7c5b9fb0f75b1e75acf7c99eded5f7b697cdc60 (diff) | |
Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-582-maint-U
# Conflicts:
# indra/llcommon/tests/llsdserialize_test.cpp
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 6bdc5ee823..2d5e86869d 100644 --- a/indra/newview/llfloatereditsky.cpp +++ b/indra/newview/llfloatereditsky.cpp @@ -523,7 +523,7 @@ void LLFloaterEditSky::refreshSkyPresetsList() for (LLEnvironment::list_name_id_t::iterator it = list.begin(); it != list.end(); ++it) { - mSkyPresetCombo->add((*it).first, LLSDArray((*it).first)((*it).second)); + mSkyPresetCombo->add((*it).first, llsd::array((*it).first, (*it).second)); } mSkyPresetCombo->setLabel(getString("combo_label")); |