summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerlinux.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-05-13 18:34:54 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-05-13 18:34:54 -0400
commit73f474d886d2430db3d5c8f7729f769b389730a4 (patch)
tree5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /indra/newview/llappviewerlinux.cpp
parent81ffd3fccac709a5903dd0d7572db50c50850347 (diff)
parent180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff)
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llappviewerlinux.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index 8695652168..5f98fd0a34 100644..100755
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -440,7 +440,7 @@ bool LLAppViewerLinux::beingDebugged()
#endif
}
-bool LLAppViewerLinux::initLogging()
+void LLAppViewerLinux::initLogging()
{
// Remove the last stack trace, if any
// This file is no longer created, since the move to Google Breakpad
@@ -449,7 +449,7 @@ bool LLAppViewerLinux::initLogging()
gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
LLFile::remove(old_stack_file);
- return LLAppViewer::initLogging();
+ LLAppViewer::initLogging();
}
bool LLAppViewerLinux::initParseCommandLine(LLCommandLineParser& clp)