diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:17:02 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:17:02 +0000 |
| commit | 15ce532ccf0d1fb387b1b048a2ed7153fad83dc2 (patch) | |
| tree | 4a78afd7409559501a709c30447745215051155c /indra/llinventory/llsettingswater.h | |
| parent | 1687719a2523e1a6a9d8ebc8aeac52c530fa8fd0 (diff) | |
| parent | cbe4cac78cf48cb9144dc2f6c194585cff87a1ce (diff) | |
Merge
Diffstat (limited to 'indra/llinventory/llsettingswater.h')
| -rw-r--r-- | indra/llinventory/llsettingswater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h index d4152acfa1..92190fa7b1 100644 --- a/indra/llinventory/llsettingswater.h +++ b/indra/llinventory/llsettingswater.h @@ -58,7 +58,7 @@ public: //--------------------------------------------------------------------- virtual std::string getSettingType() const override { return std::string("water"); } - virtual LLSettingsType getSettingTypeValue() const override { return LLSettingsType::ST_WATER; } + virtual LLSettingsType::type_e getSettingTypeValue() const override { return LLSettingsType::ST_WATER; } // Settings status virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) override; |