diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:38:08 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:38:08 -0700 |
| commit | f33d3a40bb361796d0ffcc086eedcb8de204e6ae (patch) | |
| tree | 29493d10b96a96aa103f476431862a9eb33c9606 /indra/llinventory/llsettingsdaycycle.cpp | |
| parent | 1716129fd23ff35e030808406af1a8f796dc4b01 (diff) | |
| parent | 597d28ad343d39f0812f7403119cc817dfab3d64 (diff) | |
Merge
Diffstat (limited to 'indra/llinventory/llsettingsdaycycle.cpp')
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp index 364ff570ed..25cd99b997 100644 --- a/indra/llinventory/llsettingsdaycycle.cpp +++ b/indra/llinventory/llsettingsdaycycle.cpp @@ -609,7 +609,16 @@ LLSettingsDay::validation_list_t LLSettingsDay::validationList() return validation; } -LLSettingsDay::CycleTrack_t &LLSettingsDay::getCycleTrack(S32 track) +LLSettingsDay::CycleTrack_t& LLSettingsDay::getCycleTrack(S32 track) +{ + static CycleTrack_t emptyTrack; + if (mDayTracks.size() <= track) + return emptyTrack; + + return mDayTracks[track]; +} + +const LLSettingsDay::CycleTrack_t& LLSettingsDay::getCycleTrackConst(S32 track) const { static CycleTrack_t emptyTrack; if (mDayTracks.size() <= track) |