From 2161788711f6d89564afc933707b6a0b8c1b0562 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 20 Oct 2017 16:37:03 -0700
Subject: Day cycles start

---
 indra/newview/llsettingsbase.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/llsettingsbase.cpp')

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
 {
-- 
cgit v1.2.3