diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 21:53:34 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 21:53:34 +0000 |
| commit | aba5777d747d67db43e03772d30cb50d18d1a5d5 (patch) | |
| tree | 10e4a3248143f709643bcc50490e982f93be30f7 /indra/llinventory/llsettingswater.h | |
| parent | 72270213f5eebd019b10bdd6ec15020ba3d2ecf5 (diff) | |
| parent | e2e63598d40109d01e0311ce1444d3feedffcf66 (diff) | |
Merge
Diffstat (limited to 'indra/llinventory/llsettingswater.h')
| -rw-r--r-- | indra/llinventory/llsettingswater.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h index 4d206a1be0..16d5b2353a 100644 --- a/indra/llinventory/llsettingswater.h +++ b/indra/llinventory/llsettingswater.h @@ -57,7 +57,8 @@ public: virtual ptr_t buildClone() = 0; //--------------------------------------------------------------------- - virtual std::string getSettingType() const { return std::string("water"); } + virtual std::string getSettingType() const override { return std::string("water"); } + virtual LLSettingsType getSettingTypeValue() const override { return LLSettingsType::ST_WATER; } // Settings status virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf); |