diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-23 01:04:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-23 01:04:01 +0000 |
| commit | 39018947081772bf7226d757c647520c54b18fd2 (patch) | |
| tree | 74b00b3006878d7e576b84cb3240d98c22d67db9 /indra/newview/llappviewer.h | |
| parent | c01edec021194bacb86dc9a3f5a3cc655a8cb15f (diff) | |
QAR-488 Viewer 1.20 RC 2
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 2d050c3d94..56dd0efbdd 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -124,7 +124,20 @@ public: virtual void forceErrorInifiniteLoop(); virtual void forceErrorSoftwareException(); + // *NOTE: There are currently 3 settings files: + // "Global", "PerAccount" and "CrashSettings" + // The list is found in app_settings/settings_files.xml + // but since they are used explicitly in code, + // the follow consts should also do the trick. + static const std::string sGlobalSettingsName; + static const std::string sPerAccountSettingsName; + static const std::string sCrashSettingsName; + void loadSettingsFromDirectory(ELLPath path_index); + + std::string getSettingsFileName(const std::string& file); + + protected: virtual bool initWindow(); // Initialize the viewer's window. virtual bool initLogging(); // Initialize log files, logging system, return false on failure. @@ -210,10 +223,9 @@ extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartu extern LLSD gDebugInfo; extern BOOL gAllowIdleAFK; +extern BOOL gAllowTapTapHoldRun; extern BOOL gShowObjectUpdates; -extern const char* DEFAULT_SETTINGS_FILE; // llstartup - extern BOOL gAcceptTOS; extern BOOL gAcceptCriticalMessage; |