diff options
| author | Austin Doupnik <austin@lindenlab.com> | 2009-07-09 00:59:52 +0000 |
|---|---|---|
| committer | Austin Doupnik <austin@lindenlab.com> | 2009-07-09 00:59:52 +0000 |
| commit | 394b28ce77e5e51c41c1d3d9ca9896812f404810 (patch) | |
| tree | 1e19823d3804eaac70036d181973030398c8625f /indra/newview/llappviewer.cpp | |
| parent | 163f89d77fc0ed76a8c1e79049842394f129d16b (diff) | |
DEV-35112 Renamed colors_def.xml to colors.xml. Reviewed by Richard.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index de3cf1a81b..c9b27e9802 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1701,11 +1701,7 @@ std::string LLAppViewer::getSettingsFilename(const std::string& location_key, void LLAppViewer::loadColorSettings() { - if(!LLUIColorTable::instance().loadFromSettings()) - { - convert_legacy_color_settings(); - LLUIColorTable::instance().loadFromSettings(); - } + LLUIColorTable::instance().loadFromSettings(); } bool LLAppViewer::initConfiguration() |