diff options
| author | Karen Clark <karen@lindenlab.com> | 2007-03-27 20:41:40 +0000 |
|---|---|---|
| committer | Karen Clark <karen@lindenlab.com> | 2007-03-27 20:41:40 +0000 |
| commit | 204081b8e25a5aaf2f32b3ea5e5bb8b64c38388d (patch) | |
| tree | 57bbba81a5adccc9178766641e458e86954e65c9 | |
| parent | 64395d21592ecd35b6f476d38df1a46bd8edc1a8 (diff) | |
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.
| -rw-r--r-- | indra/llcommon/llerror.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 9d60dde672..3d4deac673 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -495,7 +495,11 @@ namespace LLError { 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); #if !LL_WINDOWS addRecorder(new RecordToSyslog(identity)); |