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.h | |
parent | 1716129fd23ff35e030808406af1a8f796dc4b01 (diff) | |
parent | 597d28ad343d39f0812f7403119cc817dfab3d64 (diff) |
Merge
Diffstat (limited to 'indra/llinventory/llsettingsdaycycle.h')
-rw-r--r-- | indra/llinventory/llsettingsdaycycle.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h index 0ee5ce3e0b..46dc0cec74 100644 --- a/indra/llinventory/llsettingsdaycycle.h +++ b/indra/llinventory/llsettingsdaycycle.h @@ -80,8 +80,8 @@ public: bool initialize(bool validate_frames = false); - virtual ptr_t buildClone() = 0; - virtual ptr_t buildDeepCloneAndUncompress() = 0; + virtual ptr_t buildClone() const = 0; + virtual ptr_t buildDeepCloneAndUncompress() const = 0; virtual LLSD getSettings() const SETTINGS_OVERRIDE; virtual LLSettingsType::type_e getSettingsTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_DAYCYCLE; } @@ -118,6 +118,7 @@ public: void setInitialized(bool value = true) { mInitialized = value; } CycleTrack_t & getCycleTrack(S32 track); + const CycleTrack_t & getCycleTrackConst(S32 track) const; bool clearCycleTrack(S32 track); bool replaceCycleTrack(S32 track, const CycleTrack_t &source); bool isTrackEmpty(S32 track) const; @@ -125,7 +126,7 @@ public: virtual validation_list_t getValidationList() const SETTINGS_OVERRIDE; static validation_list_t validationList(); - virtual LLSettingsBase::ptr_t buildDerivedClone() SETTINGS_OVERRIDE { return buildClone(); } + virtual LLSettingsBase::ptr_t buildDerivedClone() const SETTINGS_OVERRIDE { return buildClone(); } LLSettingsBase::TrackPosition getUpperBoundFrame(S32 track, const LLSettingsBase::TrackPosition& keyframe); LLSettingsBase::TrackPosition getLowerBoundFrame(S32 track, const LLSettingsBase::TrackPosition& keyframe); |