diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-03-06 14:58:39 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-03-06 14:58:39 -0800 |
| commit | cbe4cac78cf48cb9144dc2f6c194585cff87a1ce (patch) | |
| tree | 5c1ae3a57ac6bdeafb78bc193ba9b081f8108774 /indra/llinventory/llsettingswater.h | |
| parent | 5621fa48537100d70e8d06b00b6c2577f5c11140 (diff) | |
Settings type inventory objects and upload the assests.
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; |