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/llsettingsbase.cpp | |
| parent | ea90ebff22e87c86c9de0cc6702d29783309ebf9 (diff) | |
Day cycles start
Diffstat (limited to 'indra/newview/llsettingsbase.cpp')
| -rw-r--r-- | indra/newview/llsettingsbase.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llsettingsbase.cpp b/indra/newview/llsettingsbase.cpp index 71ec240214..1f155776bf 100644 --- a/indra/newview/llsettingsbase.cpp +++ b/indra/newview/llsettingsbase.cpp @@ -240,6 +240,18 @@ LLSD LLSettingsBase::cloneSettings() const return combineSDMaps(mSettings, LLSD()); } +LLSettingsBase::ptr_t LLSettingsBase::buildBlend(const ptr_t &begin, const ptr_t &end, F32 blendf) +{ + if (begin->getSettingType() != end->getSettingType()) + { + LL_WARNS("SETTINGS") << "Attempt to blend settings of different types! " << + begin->getSettingType() << "<->" << end->getSettingType() << LL_ENDL; + + return LLSettingsBase::ptr_t(); + } + + return begin->blend(end, blendf); +} void LLSettingsBase::exportSettings(std::string name) const { |