summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-02-27 11:02:37 -0800
committerRider Linden <rider@lindenlab.com>2018-02-27 11:02:37 -0800
commitedc12edaae2333810161fadc787920b252e5fec1 (patch)
treea6a7a323691c30ea8a226ba3b02119042acb2ec1 /indra/llinventory
parent87f56754556d9a7a3cf23f35c4ac163447799f98 (diff)
Missed two overrides.
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llsettingsdaycycle.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h
index ce87e28367..2d0fa4a840 100644
--- a/indra/llinventory/llsettingsdaycycle.h
+++ b/indra/llinventory/llsettingsdaycycle.h
@@ -76,10 +76,10 @@ public:
//---------------------------------------------------------------------
- virtual std::string getSettingType() const { return std::string("daycycle"); }
+ virtual std::string getSettingType() const override { return std::string("daycycle"); }
// Settings status
- virtual void blend(const LLSettingsBase::ptr_t &other, F64 mix);
+ virtual void blend(const LLSettingsBase::ptr_t &other, F64 mix) override;
static LLSD defaults();