From 02ffb06463e8b2ae3654c0de35d7f0fbab72025c Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 22 Jun 2018 01:00:23 +0100
Subject: Fix double blend and warnings reported as errors.

---
 indra/llinventory/llsettingsbase.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index 7bcafabb8a..f282f0c7dc 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -298,8 +298,9 @@ bool LLSettingsBase::validate()
     }
     if (result["warnings"].size() > 0)
     {
-        LL_WARNS("SETTINGS") << "Validation warnings: " << result["errors"] << LL_ENDL;
+        LL_WARNS("SETTINGS") << "Validation warnings: " << result["warnings"] << LL_ENDL;
     }
+    LL_WARNS("SETTINGS") << "Validation success is " << result["success"] << LL_ENDL;
 
     return result["success"].asBoolean();
 }
@@ -593,7 +594,6 @@ F64 LLSettingsBlender::setBlendFactor(const LLSettingsBase::BlendFactor& blendf_
     {
         LL_WARNS("SETTINGS") << "No target for settings blender." << LL_ENDL;
     }
-    mTarget->blend(mFinal, blendf);
 
     return blendf;
 }
-- 
cgit v1.2.3