diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-13 17:51:14 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-13 17:51:14 -0500 |
| commit | 27f11d9868bc72e7096ae6266af1c6c9318c545e (patch) | |
| tree | 12190521b6870891072e312c8b3e8864721aa075 /indra/llui/lluicolortable.cpp | |
| parent | fbab245e487650d6420c9fe33cf07123af12f422 (diff) | |
| parent | dd06d42c09e5e1f4b28559059ec8393e53f767a7 (diff) | |
merge
Diffstat (limited to 'indra/llui/lluicolortable.cpp')
| -rw-r--r-- | indra/llui/lluicolortable.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index 0641f6d175..9455d09cc0 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -215,6 +215,12 @@ bool LLUIColorTable::loadFromSettings() result |= loadFromFilename(current_filename, mLoadedColors); } + current_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors.xml"); + if(current_filename != default_filename) + { + result |= loadFromFilename(current_filename, mLoadedColors); + } + std::string user_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "colors.xml"); loadFromFilename(user_filename, mUserSetColors); |