From 204081b8e25a5aaf2f32b3ea5e5bb8b64c38388d Mon Sep 17 00:00:00 2001
From: Karen Clark <karen@lindenlab.com>
Date: Tue, 27 Mar 2007 20:41:40 +0000
Subject: 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.

---
 indra/llcommon/llerror.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon')

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));
-- 
cgit v1.2.3