1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index d48ccdb9ea..f8c687b0fc 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1360,6 +1360,14 @@ bool LLAppViewer::frame()
 
 bool LLAppViewer::doFrame()
 {
+    // SIGTERM asks for a normal logout. Quitting immediately skips
+    // LogoutRequest and leaves the agent in the region.
+    if (LLApp::consumeSignalQuit() && !mQuitRequested && !isQuitting())
+    {
+        LL_INFOS() << "Terminate signal, logging out before exit" << LL_ENDL;
+        requestQuit();
+    }
+
     resumeMainloopTimeout("Main:doFrameStart");
 
     U32 fpsLimitMaxFps = (U32)gSavedSettings.getU32("MaxFPS");