diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-10-11 19:51:07 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-10-11 19:51:07 -0400 |
| commit | 730d13a76a4b06e6dbdd4bd5829a90bcb98b52b3 (patch) | |
| tree | 0b13e0f43ea28925bbf7ae2baceb71ac04383855 /indra/llui/lluicolortable.cpp | |
| parent | 949e18d98ad272562628894f4102d3a4314ed7b0 (diff) | |
Change LLDir::findSkinnedFilenames() to use enum instead of bool.
At Richard's suggestion, changed the bool merge parameter to new enum
ESkinConstraint with values CURRENT_SKIN and ALL_SKINS. This clarifies what
we're requesting at the point of the call.
Diffstat (limited to 'indra/llui/lluicolortable.cpp')
| -rw-r--r-- | indra/llui/lluicolortable.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index 2717445396..ffeff15968 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -207,9 +207,10 @@ bool LLUIColorTable::loadFromSettings() { bool result = false; - // pass merge=true because we want colors.xml from every skin dir + // pass constraint=LLDir::ALL_SKINS because we want colors.xml from every + // skin dir BOOST_FOREACH(std::string colors_path, - gDirUtilp->findSkinnedFilenames(LLDir::SKINBASE, "colors.xml", true)) + gDirUtilp->findSkinnedFilenames(LLDir::SKINBASE, "colors.xml", LLDir::ALL_SKINS)) { result |= loadFromFilename(colors_path, mLoadedColors); } |