diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-21 10:33:58 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-21 10:33:58 -0800 |
| commit | e1b198a36b051051941c61d0a558766591ed4cfc (patch) | |
| tree | 1809bf28779ab1f9b0cd05c97f94af3b7dfa5532 /indra/llui/lluicolortable.cpp | |
| parent | fdd5348f81d51363a1639de8b3cc4414fc0f4982 (diff) | |
| parent | 9c97a200bebe310f91c9ab181fbe337eeab30aaa (diff) | |
Merge from trunk
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); |