diff options
| author | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
| commit | 50d21a75a7c6a41a5a3355a8c4406a33454c70dd (patch) | |
| tree | e2fe3e855d710700cd956b505a3f0548038c9dac /indra/llui/lluicolortable.cpp | |
| parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) | |
| parent | 4bdac3f152862b257b9babe9b5a43329c9f544f9 (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); |