summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-06-04 16:50:13 -0700
committerRider Linden <rider@lindenlab.com>2018-06-04 16:50:13 -0700
commitb06803225bff30e863ea18cae1d33f42a4fd937e (patch)
tree7cc96c7fcb573bc20dc6db93a606b846474ce7c9 /indra/llinventory
parent2a613d7363c4e91a7258d4f0ea3971db1569e788 (diff)
Reconnect apply to region and parcel reconnected to interface.
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llsettingsdaycycle.cpp12
-rw-r--r--indra/llinventory/llsettingsdaycycle.h1
2 files changed, 13 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp
index e67da95a6c..60e962b612 100644
--- a/indra/llinventory/llsettingsdaycycle.cpp
+++ b/indra/llinventory/llsettingsdaycycle.cpp
@@ -614,6 +614,18 @@ LLSettingsBase::ptr_t LLSettingsDay::getSettingsAtKeyframe(F32 keyframe, S32 tra
return LLSettingsBase::ptr_t();
}
+void LLSettingsDay::clearTrack(S32 track)
+{
+ if ((track < 0) || (track >= TRACK_MAX))
+ {
+ LL_WARNS("DAYCYCLE") << "Attempt to clear track (#" << track << ") out of range!" << LL_ENDL;
+ return;
+ }
+
+ mDayTracks[track].clear();
+}
+
+
F32 LLSettingsDay::getUpperBoundFrame(S32 track, F32 keyframe)
{
return get_wrapping_atafter(mDayTracks[track], keyframe)->first;
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h
index 101cacc3a2..6fb48225c7 100644
--- a/indra/llinventory/llsettingsdaycycle.h
+++ b/indra/llinventory/llsettingsdaycycle.h
@@ -98,6 +98,7 @@ public:
LLSettingsSkyPtr_t getSkyAtKeyframe(F32 keyframe, S32 track) const;
void setSettingsAtKeyframe(const LLSettingsBase::ptr_t &settings, F32 keyframe, S32 track);
LLSettingsBase::ptr_t getSettingsAtKeyframe(F32 keyframe, S32 track) const;
+ void clearTrack(S32 track);
//---------------------------------------------------------------------
void startDayCycle();