diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-30 17:55:42 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-30 17:55:42 +0000 |
| commit | 7b6cd0859cbdf80f027bcec3948c7c165c7fe114 (patch) | |
| tree | 0b5147ba3eb7d9d8a7feaecfabf11d8fff6f966e /indra/llinventory/llsettingsbase.cpp | |
| parent | 9a8e124fdecbeb57f65645d102f5f1767f8e4d16 (diff) | |
| parent | 86419eb11be50bf75c9049a80e422d7704dd7d30 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #170)
SL-1476 EEP Better shader transitions
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/llinventory/llsettingsbase.cpp')
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 80680948b5..4b8be04355 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -230,6 +230,11 @@ LLSD LLSettingsBase::interpolateSDMap(const LLSD &settings, const LLSD &other, c // Blend against default value newSettings[key_name] = interpolateSDValue(key_name, def_iter->second.getDefaultValue(), (*it).second, defaults, mix, slerps); } + else if ((*it).second.type() == LLSD::TypeMap) + { + // interpolate in case there are defaults inside (part of legacy) + newSettings[key_name] = interpolateSDValue(key_name, LLSDMap(), (*it).second, defaults, mix, slerps); + } // else do nothing when no known defaults // TODO: Should I blend this out instead? } |