summaryrefslogtreecommitdiff
path: root/indra/newview/llsettingswater.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llsettingswater.h')
-rw-r--r--indra/newview/llsettingswater.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsettingswater.h b/indra/newview/llsettingswater.h
index d8c9ff5cc6..6a7e692c25 100644
--- a/indra/newview/llsettingswater.h
+++ b/indra/newview/llsettingswater.h
@@ -63,7 +63,7 @@ public:
virtual std::string getSettingType() const { return std::string("water"); }
// Settings status
- ptr_t blend(const ptr_t &other, F32 mix) const;
+ virtual LLSettingsBase::ptr_t blend(const LLSettingsBase::ptr_t &end, F32 blendf) const;
static LLSD defaults();