summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2019-06-05 14:27:48 -0400
committerOz Linden <oz@lindenlab.com>2019-06-05 14:27:48 -0400
commite711376cc75a51973291d1730467c0b6e3a74226 (patch)
tree38b320f866e8d9a402a081dac0d1f00f95e66823 /indra/newview/llappviewer.cpp
parent1e98a607d08019f66ae878e4cb247e850a7443cf (diff)
assorted cleanup
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0e97ed5a47..35f9d7f4fd 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3386,9 +3386,8 @@ void LLAppViewer::writeSystemInfo()
gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)true;
#else // LL_BUGSPLAT
// "CrashNotHandled" is obsolete; it used (not very successsfully)
- // to try to distinguish crashes from freezes
+ // to try to distinguish crashes from freezes - the intent here to to avoid calling it a freeze
gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)false;
- gDebugInfo["Dynamic"]["FatalMessage"] = LLError::getFatalMessage();
#endif // ! LL_BUGSPLAT
// Insert crash host url (url to post crash log to) if configured. This insures
@@ -3617,7 +3616,7 @@ void LLAppViewer::handleViewerCrash()
if (LLWorld::instanceExists()) LLWorld::getInstance()->getInfo(gDebugInfo["Dynamic"]);
- gDebugInfo["Dynamic"]["FatalMessage"] = LLError::getFatalMessage();
+ gDebugInfo["FatalMessage"] = LLError::getFatalMessage();
// Close the debug file
pApp->writeDebugInfo(false); //false answers the isStatic question with the least overhead.
@@ -5476,11 +5475,6 @@ void LLAppViewer::pauseMainloopTimeout()
void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
{
-// if(!restoreErrorTrap())
-// {
-// LL_WARNS() << "!!!!!!!!!!!!! Its an error trap!!!!" << state << LL_ENDL;
-// }
-
if(mMainloopTimeout)
{
if(secs < 0.0f)