diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-05-04 11:39:03 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-05-04 11:39:03 -0700 |
| commit | a22d62e8edd8448ced210a39ce996472a54fa1c9 (patch) | |
| tree | 82ec1d027821a83d498a848141249adfd4e36310 /indra/llinventory/llsettingsdaycycle.cpp | |
| parent | 52f8ff9961aeb463fcbf6fa22314575442aa5352 (diff) | |
| parent | e7c5b9fb0f75b1e75acf7c99eded5f7b697cdc60 (diff) | |
Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-559
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; |