diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/llappviewer.h | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llappviewer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h index 68bdb24..801deb1 100644 --- a/linden/indra/newview/llappviewer.h +++ b/linden/indra/newview/llappviewer.h | |||
| @@ -122,7 +122,8 @@ public: | |||
| 122 | static const std::string sPerAccountSettingsName; | 122 | static const std::string sPerAccountSettingsName; |
| 123 | static const std::string sCrashSettingsName; | 123 | static const std::string sCrashSettingsName; |
| 124 | 124 | ||
| 125 | void loadSettingsFromDirectory(ELLPath path_index, bool set_defaults = false); | 125 | // returns false if loading a *required* settings file fails. |
| 126 | bool loadSettingsFromDirectory(ELLPath path_index, bool set_defaults = false); | ||
| 126 | 127 | ||
| 127 | std::string getSettingsFileName(const std::string& file); | 128 | std::string getSettingsFileName(const std::string& file); |
| 128 | 129 | ||