diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:53:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 19:53:29 +0300 |
| commit | e5b14e4c2ceac66cd1083c497f4bc4edc4e43436 (patch) | |
| tree | fa37803eb1815775a10c86264c643a932a87fca9 /indra/llui/lluicolortable.cpp | |
| parent | b1b2ae00cad6c624ae3ce45bd27bc07f48ce70dd (diff) | |
| parent | 195a6c56f4899790c5016b5d5b8cb701134a514f (diff) | |
Merge pull request #1315 from secondlife/marchcat/c-merge
Release (Maint YZ) -> Maint C merge
Diffstat (limited to 'indra/llui/lluicolortable.cpp')
| -rw-r--r-- | indra/llui/lluicolortable.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index 096336045c..f43bdf1fdc 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -32,7 +32,6 @@ #include "llui.h" #include "lluicolortable.h" #include "lluictrlfactory.h" -#include <boost/foreach.hpp> LLUIColorTable::ColorParams::ColorParams() : value("value"), @@ -208,7 +207,7 @@ bool LLUIColorTable::loadFromSettings() // pass constraint=LLDir::ALL_SKINS because we want colors.xml from every // skin dir - BOOST_FOREACH(std::string colors_path, + for (const std::string& colors_path : gDirUtilp->findSkinnedFilenames(LLDir::SKINBASE, "colors.xml", LLDir::ALL_SKINS)) { result |= loadFromFilename(colors_path, mLoadedColors); |