diff options
| author | Richard Linden <none@none> | 2010-10-25 12:35:40 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-25 12:35:40 -0700 |
| commit | 7a975354a28fa700486759cea3fd5a9445ac46b7 (patch) | |
| tree | 1a4cfb582d094c121c98f85c2ffcf931111b3040 /indra/llui | |
| parent | acd9f926092950b1cc01e0e7e99051d395446dc3 (diff) | |
EXP-297 FIX Gray Bar shown on top of Skylight Viewer login screen during login on Gaikai
Diffstat (limited to 'indra/llui')
| -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); |