diff options
| author | Jacek Antonelli | 2008-09-28 17:21:23 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-28 17:21:46 -0500 |
| commit | 31e7c77a411d94bc87f0232588b339149bb29a49 (patch) | |
| tree | 49e487700e91713e620e4d33f20b7f7afb5a2fa9 /linden/indra/newview/llappviewer.h | |
| parent | Second Life viewer sources 1.21.2-RC (diff) | |
| download | meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.zip meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.gz meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.bz2 meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.xz | |
Second Life viewer sources 1.21.3-RC
Diffstat (limited to 'linden/indra/newview/llappviewer.h')
| -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 | ||