summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerrorcontrol.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-02-26 09:29:38 -0800
committerRider Linden <rider@lindenlab.com>2018-02-26 09:29:38 -0800
commite2e63598d40109d01e0311ce1444d3feedffcf66 (patch)
tree167a7d41785623cea7d7b466b4b0554e80639a55 /indra/llcommon/llerrorcontrol.h
parentb766466b3013e39831bcfcaef5d1089c07202afb (diff)
parent5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff)
Merge
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