summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerrorcontrol.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-02-27 09:52:50 -0500
committerOz Linden <oz@lindenlab.com>2017-02-27 09:52:50 -0500
commit0a7fd3686a09a53ebe86e1e37b156e2f04f6cb2f (patch)
tree179e938b5a0825bb97af2e9480c7356c23ed7528 /indra/llcommon/llerrorcontrol.h
parent12e23a3cb8aadfc74f2ba469c671df51552c557b (diff)
Look for logcontrol-dev.xml in the user settings directory
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