diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-04 16:09:50 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-04 16:09:50 +0300 |
| commit | 55e2d489411517b8acd660f5d115efc98170d144 (patch) | |
| tree | 40769235f0f2b30eb434136856ac09cae2ec53fe /indra/llinventory | |
| parent | ff8dcc23bfde402feb4c33b74194852a730bf5bb (diff) | |
| parent | e7c5b9fb0f75b1e75acf7c99eded5f7b697cdc60 (diff) | |
Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-577-maint-S
Diffstat (limited to 'indra/llinventory')
| -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; |