diff options
| author | Jacek Antonelli | 2008-08-15 23:45:45 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:45 -0500 |
| commit | b1831d23bfdd0c876ac8cf687d6d3cf02345e28e (patch) | |
| tree | e977d6563859940ad05af08b7bc150f57a7cb548 /linden/indra/newview/llviewermenu.cpp | |
| parent | Second Life viewer sources 1.20.3 (diff) | |
| download | meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.zip meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.tar.gz meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.tar.bz2 meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.tar.xz | |
Second Life viewer sources 1.20.4
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 6ee80a6..2459133 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
| @@ -4897,12 +4897,12 @@ BOOL menu_check_build_tool( void* user_data ) | |||
| 4897 | void handle_reload_settings(void*) | 4897 | void handle_reload_settings(void*) |
| 4898 | { | 4898 | { |
| 4899 | gSavedSettings.resetToDefaults(); | 4899 | gSavedSettings.resetToDefaults(); |
| 4900 | gSavedSettings.loadFromFile(gSavedSettings.getString("ClientSettingsFile"), TRUE); | 4900 | gSavedSettings.loadFromFile(gSavedSettings.getString("ClientSettingsFile")); |
| 4901 | 4901 | ||
| 4902 | llinfos << "Loading colors from colors.xml" << llendl; | 4902 | llinfos << "Loading colors from colors.xml" << llendl; |
| 4903 | std::string color_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"colors.xml"); | 4903 | std::string color_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"colors.xml"); |
| 4904 | gColors.resetToDefaults(); | 4904 | gColors.resetToDefaults(); |
| 4905 | gColors.loadFromFile(color_file, FALSE, TYPE_COL4U); | 4905 | gColors.loadFromFileLegacy(color_file, FALSE, TYPE_COL4U); |
| 4906 | } | 4906 | } |
| 4907 | 4907 | ||
| 4908 | class LLWorldSetHomeLocation : public view_listener_t | 4908 | class LLWorldSetHomeLocation : public view_listener_t |