diff options
author | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
commit | c5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch) | |
tree | c2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /indra/newview/llappviewerlinux.cpp | |
parent | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff) | |
parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) |
DRTVWR-489: trivial merge conflict fix
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
-rw-r--r-- | indra/newview/llappviewerlinux.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index dc487967fc..9f58f90326 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -80,8 +80,6 @@ int main( int argc, char **argv ) // install unexpected exception handler gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler); - // install crash handlers - viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash); bool ok = viewer_app_ptr->init(); if(!ok) |