1 files changed, 26 insertions, 5 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index ef25fb8..9073874 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1019,7 +1019,7 @@ bool idle_startup()
                 }
 
                 // Display the startup progress bar.
-                gViewerWindow->setShowProgress(TRUE);
+                gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
                 gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Quit")); // *TODO: Translate
 
                 // Poke the VFS, which could potentially block for a while if
@@ -2927,13 +2927,34 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
 }
 
 
-
+std::string last_d;
 void set_startup_status(const F32 frac, const std::string& string, const std::string& msg)
 {
-        gViewerWindow->setProgressPercent(frac*100);
-        gViewerWindow->setProgressString(string);
+        if(gSavedSettings.getBOOL("DisableLoginLogoutScreens"))
+        {
+                std::string new_d = string;
+                if(new_d != last_d)
+                {
+                        last_d = new_d;
+                        LLChat chat;
+                        chat.mText = new_d;
+                        chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                        LLFloaterChat::addChat(chat);
+                        if(new_d == LLTrans::getString("LoginWaitingForRegionHandshake"))
+                        {
+                                chat.mText = "MOTD: "+msg;
+                                chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                                LLFloaterChat::addChat(chat);
+                        }
+                }
+        }
+        else
+        {
+                gViewerWindow->setProgressPercent(frac*100);
+                gViewerWindow->setProgressString(string);
 
-        gViewerWindow->setProgressMessage(msg);
+                gViewerWindow->setProgressMessage(msg);
+        }
 }
 
 bool login_alert_status(const LLSD& notification, const LLSD& response)