summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerrorcontrol.h
diff options
context:
space:
mode:
authorAndreyL ProductEngine <none@none>2018-02-12 21:15:00 +0200
committerAndreyL ProductEngine <none@none>2018-02-12 21:15:00 +0200
commite6765df1baa40a46b77e5362c8855a336125e5f7 (patch)
treeffb3564aaa95b23f0d7ab6f6eeea8d08f3e9b317 /indra/llcommon/llerrorcontrol.h
parentb0950991988ddd56bec9074316d883a00b0cae4c (diff)
parent02342cb9ae3140cb49ec2818fee5692b3796bf8a (diff)
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/llcommon/llerrorcontrol.h')
-rw-r--r--indra/llcommon/llerrorcontrol.h7
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