diff options
author | Jacek Antonelli | 2008-08-15 23:45:59 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:59 -0500 |
commit | 6e91a9cc3d5a610198cf526a76e2ab642f10ecd7 (patch) | |
tree | b023869f9daa7f61ea3ab27112d37524bdd88de4 /linden/indra/newview/llappviewer.h | |
parent | Second Life viewer sources 1.20.12 (diff) | |
download | meta-impy-6e91a9cc3d5a610198cf526a76e2ab642f10ecd7.zip meta-impy-6e91a9cc3d5a610198cf526a76e2ab642f10ecd7.tar.gz meta-impy-6e91a9cc3d5a610198cf526a76e2ab642f10ecd7.tar.bz2 meta-impy-6e91a9cc3d5a610198cf526a76e2ab642f10ecd7.tar.xz |
Second Life viewer sources 1.20.13
Diffstat (limited to 'linden/indra/newview/llappviewer.h')
-rw-r--r-- | linden/indra/newview/llappviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h index c98be41..f00211f 100644 --- a/linden/indra/newview/llappviewer.h +++ b/linden/indra/newview/llappviewer.h | |||
@@ -122,7 +122,7 @@ 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); | 125 | void loadSettingsFromDirectory(ELLPath path_index, bool set_defaults = false); |
126 | 126 | ||
127 | std::string getSettingsFileName(const std::string& file); | 127 | std::string getSettingsFileName(const std::string& file); |
128 | 128 | ||