diff options
| author | callum_linden <none@none> | 2018-02-14 10:56:31 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-02-14 10:56:31 -0800 |
| commit | 08cb3fbe32b62ed3f53f68633ada9eab44dccb0b (patch) | |
| tree | caa4327b04a438978fd9bae207ea86269f1525b6 /indra/llcommon/llerrorcontrol.h | |
| parent | b2eb85df79f317d2b587c969178cea9b96c81213 (diff) | |
| parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) | |
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/llcommon/llerrorcontrol.h')
| -rw-r--r-- | indra/llcommon/llerrorcontrol.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llcommon/llerrorcontrol.h b/indra/llcommon/llerrorcontrol.h index 56e84f7172..caf2ba72c2 100644 --- a/indra/llcommon/llerrorcontrol.h +++ b/indra/llcommon/llerrorcontrol.h @@ -60,12 +60,7 @@ public: namespace LLError { - LL_COMMON_API void initForServer(const std::string& identity); - // resets all logging settings to defaults needed by server processes - // logs to stderr, syslog, and windows debug log - // the identity string is used for in the syslog - - LL_COMMON_API void initForApplication(const std::string& dir, bool log_to_stderr = true); + LL_COMMON_API void initForApplication(const std::string& user_dir, const std::string& app_dir, bool log_to_stderr = true); // resets all logging settings to defaults needed by applicaitons // logs to stderr and windows debug log // sets up log configuration from the file logcontrol.xml in dir |