Skip to content
Snippets Groups Projects
Commit 204081b8 authored by Karen Clark's avatar Karen Clark
Browse files

Ported MarkL's fix for SL-38277 to release from message-liberation-5. svn...

Ported MarkL's fix for SL-38277 to release from message-liberation-5. svn merge -r59784:59785 svn+ssh://svn.lindenlab.com/svn/linden/branches/message-liberation-5 into svn+ssh://svn.lindenlab.com/svn/linden/release.
parent 64395d21
No related branches found
No related tags found
No related merge requests found
...@@ -495,7 +495,11 @@ namespace LLError ...@@ -495,7 +495,11 @@ namespace LLError
{ {
void initForServer(const std::string& identity) void initForServer(const std::string& identity)
{ {
std::string dir = LLApp::instance()->getOption("configdir"); std::string dir = "/opt/linden/etc";
if (LLApp::instance())
{
dir = LLApp::instance()->getOption("configdir").asString();
}
commonInit(dir); commonInit(dir);
#if !LL_WINDOWS #if !LL_WINDOWS
addRecorder(new RecordToSyslog(identity)); addRecorder(new RecordToSyslog(identity));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment