diff options
author | Graham Linden <graham@lindenlab.com> | 2018-06-22 01:00:23 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-06-22 01:00:23 +0100 |
commit | 02ffb06463e8b2ae3654c0de35d7f0fbab72025c (patch) | |
tree | 2f7a80dfb0281c3fac28c7f76bfa238e57edfa9f /indra/llinventory | |
parent | a02b3500b9979c10336eb13674279b3c07367445 (diff) |
Fix double blend and warnings reported as errors.
Diffstat (limited to 'indra/llinventory')
-rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |