diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-07-12 10:08:56 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-07-12 10:08:56 -0400 |
commit | 73d90aa9dd87986dc2ef8f39db346b71c58b181b (patch) | |
tree | a2ec930f732aaed7d7addbb22bb34b15c78d408b /indra/llinventory/llsettingsdaycycle.cpp | |
parent | 8e70575be833cf2056b1ceef7ef842cbc7700ce0 (diff) | |
parent | e80f0f331dbfca686e0a80c557e9b1e455c8d167 (diff) |
SL-18837: Merge branch 'DRTVWR-587-maint-V' into rm-cxxstd.
Diffstat (limited to 'indra/llinventory/llsettingsdaycycle.cpp')
-rw-r--r-- | indra/llinventory/llsettingsdaycycle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp index 241826604f..42dd5e3d10 100644 --- a/indra/llinventory/llsettingsdaycycle.cpp +++ b/indra/llinventory/llsettingsdaycycle.cpp @@ -440,8 +440,8 @@ LLSD LLSettingsDay::defaults() } LLSD tracks; - tracks.append(LLSDArray(waterTrack)); - tracks.append(LLSDArray(skyTrack)); + tracks.append(llsd::array(waterTrack)); + tracks.append(llsd::array(skyTrack)); dfltsetting[SETTING_TRACKS] = tracks; dfltsetting[SETTING_FRAMES] = frames; |