diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-22 00:07:03 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-22 00:07:03 +0000 |
| commit | 4356b8dc0ea7754ce643596d99f3f051a8f8917a (patch) | |
| tree | 325212e284747d972c5f94df5044f287b49f3fc4 | |
| parent | f15ee2c965a8bfebc9d7b30fb7b42d653c6f88ed (diff) | |
| parent | 02ffb06463e8b2ae3654c0de35d7f0fbab72025c (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #6)
Fix double blend and warnings reported as errors.
| -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; } |