diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-07-21 11:27:55 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-07-21 11:27:55 -0400 |
| commit | 25330b47f961b68df046665ce0576e6f23d1f3e5 (patch) | |
| tree | db84983b338972d1c332b45742c643f9d18c3fe3 /indra/llui/lluicolortable.cpp | |
| parent | 248f78b45ec9ee275f3b97e50b9962f2e54dbde2 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
SL-18837: Merge branch 'main' of secondlife/viewer into actions
Diffstat (limited to 'indra/llui/lluicolortable.cpp')
| -rw-r--r-- | indra/llui/lluicolortable.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index 244f0c6f00..096336045c 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -200,7 +200,6 @@ LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& defa void LLUIColorTable::setColor(const std::string& name, const LLColor4& color) { setColor(name, color, mUserSetColors); - setColor(name, color, mLoadedColors); } bool LLUIColorTable::loadFromSettings() @@ -229,6 +228,11 @@ void LLUIColorTable::saveUserSettings() const it != mUserSetColors.end(); ++it) { + // Compare user color value with the default value, skip if equal + string_color_map_t::const_iterator itd = mLoadedColors.find(it->first); + if(itd != mLoadedColors.end() && itd->second == it->second) + continue; + ColorEntryParams color_entry; color_entry.name = it->first; color_entry.color.value = it->second; |