diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-10-20 16:37:03 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-10-20 16:37:03 -0700 |
| commit | 2161788711f6d89564afc933707b6a0b8c1b0562 (patch) | |
| tree | 148bccd32927e33f3650de0c256557d3211c9ab8 /indra/newview/llsettingswater.h | |
| parent | ea90ebff22e87c86c9de0cc6702d29783309ebf9 (diff) | |
Day cycles start
Diffstat (limited to 'indra/newview/llsettingswater.h')
| -rw-r--r-- | indra/newview/llsettingswater.h | 2 |
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(); |