diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-01-08 15:10:25 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-01-08 15:10:25 -0800 |
| commit | 8211f57205f0008d8ffb9bfcd465ca26d906e19c (patch) | |
| tree | d5ab9820e70d6828220841141abad38c548759ba /indra/llinventory/llsettingswater.cpp | |
| parent | 1df10afa2a7802763330475e1a90547c3cff7c06 (diff) | |
MAINT-7699: Deliver new settings to viewer via cap
Diffstat (limited to 'indra/llinventory/llsettingswater.cpp')
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index 1b960746d5..00f870bbb0 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -159,7 +159,7 @@ LLSD LLSettingsWater::translateLegacySettings(LLSD legacy) return newsettings; } -void LLSettingsWater::blend(const LLSettingsBase::ptr_t &end, F32 blendf) +void LLSettingsWater::blend(const LLSettingsBase::ptr_t &end, F64 blendf) { LLSettingsWater::ptr_t other = boost::static_pointer_cast<LLSettingsWater>(end); LLSD blenddata = interpolateSDMap(mSettings, other->mSettings, blendf); |