Ported disable login/tp screen options from Emerald (in Preferences > Advanced)

1 files changed, 2 insertions, 2 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index e4cd3af..9b7eadf 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3673,7 +3673,7 @@ void LLAppViewer::idleShutdown()
                 static S32 total_uploads = 0;
                 // Sometimes total upload count can change during logout.
                 total_uploads = llmax(total_uploads, pending_uploads);
-                gViewerWindow->setShowProgress(TRUE);
+                gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
                 S32 finished_uploads = total_uploads - pending_uploads;
                 F32 percent = 100.f * finished_uploads / total_uploads;
                 gViewerWindow->setProgressPercent(percent);
@@ -3687,7 +3687,7 @@ void LLAppViewer::idleShutdown()
                 sendLogoutRequest();
 
                 // Wait for a LogoutReply message
-                gViewerWindow->setShowProgress(TRUE);
+                gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
                 gViewerWindow->setProgressPercent(100.f);
                 gViewerWindow->setProgressString("Logging out...");
                 return;