summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2019-09-24 14:27:21 -0400
committerOz Linden <oz@lindenlab.com>2019-09-24 14:27:21 -0400
commitd0619f8e476c1c5118ae926dfe1746f1dda986d8 (patch)
treece86cf3f6d4362041d50579beda45a54fc6d848f /indra/newview/llappviewer.cpp
parent83ec9ebfbd602771dbc45c08fe203044b5ce3527 (diff)
improve fatal hook logging
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 35f9d7f4fd..9258d1a219 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2166,7 +2166,8 @@ void LLAppViewer::initLoggingAndGetLastDuration()
LLError::initForApplication( gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "")
,gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "")
);
- LLError::setFatalHook(fatalErrorHook);
+
+ // TBD fatal hook belongs here
// Remove the last ".old" log file.
std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
@@ -2228,6 +2229,10 @@ void LLAppViewer::initLoggingAndGetLastDuration()
{
LL_WARNS("MarkerFile") << duration_log_msg << LL_ENDL;
}
+
+ // TBD - temporary location for fatal hook (should be above, but for now it logs...)
+ LLError::setFatalHook(fatalErrorHook);
+
}
bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,