diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-09 16:48:07 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-09 16:48:07 -0800 |
| commit | 95445fb1b56a60145933db0891133230c87274b8 (patch) | |
| tree | f9b03971e89800c68b4c4430b13c90af6cba51e7 /indra/llui/lluicolortable.cpp | |
| parent | 089665ce4eab97d0ab58e08914f852219ed3fae7 (diff) | |
| parent | cf6147f7c092e6ca10697dea341099c5e281df00 (diff) | |
Merge with viewer-development.
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); |