1 files changed, 121 insertions, 137 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 914b993..52f4d1a 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -127,6 +127,7 @@
 #include "llsky.h"
 #include "llsrv.h"
 #include "llstatview.h"
+#include "lltrans.h"
 #include "llsurface.h"
 #include "lltexturecache.h"
 #include "lltexturefetch.h"
@@ -264,8 +265,8 @@ namespace
                                                   const char* message, const LLSD& body, 
                                                   LLHTTPClient::ResponderPtr response) const
                 {
-                        llwarns << " attemped to send " << message << " to " << host
-                                        << " with null sender" << llendl;
+                        LL_WARNS("AppInit") << " attemped to send " << message << " to " << host
+                                        << " with null sender" << LL_ENDL;
                 }
         };
 }
@@ -427,17 +428,17 @@ BOOL idle_startup()
 
                 if (ll_init_ares() == NULL)
                 {
-                        llerrs << "Could not start address resolution system" << llendl;
+                        LL_ERRS("AppInit") << "Could not start address resolution system" << LL_ENDL;
                 }
                 
                 //
                 // Initialize messaging system
                 //
-                llinfos << "Initializing messaging system..." << llendl;
+                LL_DEBUGS("AppInit") << "Initializing messaging system..." << LL_ENDL;
 
                 std::string message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message_template.msg");
 
-                FILE* found_template = NULL;
+                LLFILE* found_template = NULL;
                 found_template = LLFile::fopen(message_template_path.c_str(), "r");             /* Flawfinder: ignore */
                 if (found_template)
                 {
@@ -495,7 +496,7 @@ BOOL idle_startup()
 
                         if (gSavedSettings.getBOOL("LogMessages"))
                         {
-                                llinfos << "Message logging activated!" << llendl;
+                                LL_DEBUGS("AppInit") << "Message logging activated!" << LL_ENDL;
                                 msg->startLogging();
                         }
 
@@ -520,13 +521,13 @@ BOOL idle_startup()
             F32 outBandwidth = gSavedSettings.getF32("OutBandwidth"); 
                         if (inBandwidth != 0.f)
                         {
-                                llinfos << "Setting packetring incoming bandwidth to " << inBandwidth << llendl;
+                                LL_DEBUGS("AppInit") << "Setting packetring incoming bandwidth to " << inBandwidth << LL_ENDL;
                                 msg->mPacketRing.setUseInThrottle(TRUE);
                                 msg->mPacketRing.setInBandwidth(inBandwidth);
                         }
                         if (outBandwidth != 0.f)
                         {
-                                llinfos << "Setting packetring outgoing bandwidth to " << outBandwidth << llendl;
+                                LL_DEBUGS("AppInit") << "Setting packetring outgoing bandwidth to " << outBandwidth << LL_ENDL;
                                 msg->mPacketRing.setUseOutThrottle(TRUE);
                                 msg->mPacketRing.setOutBandwidth(outBandwidth);
                         }
@@ -557,7 +558,7 @@ BOOL idle_startup()
                                 BOOL init = gAudiop->init(kAUDIO_NUM_SOURCES, window_handle);
                                 if(!init)
                                 {
-                                        llwarns << "Unable to initialize audio engine" << llendl;
+                                        LL_WARNS("AppInit") << "Unable to initialize audio engine" << LL_ENDL;
                                 }
                                 gAudiop->setMuted(TRUE);
                         }
@@ -565,7 +566,7 @@ BOOL idle_startup()
 
                 if (LLTimer::knownBadTimer())
                 {
-                        llwarns << "Unreliable timers detected (may be bad PCI chipset)!!" << llendl;
+                        LL_WARNS("AppInit") << "Unreliable timers detected (may be bad PCI chipset)!!" << LL_ENDL;
                 }
 
                 //
@@ -638,7 +639,7 @@ BOOL idle_startup()
         //---------------------------------------------------------------------
         if (STATE_MEDIA_INIT == LLStartUp::getStartupState())
         {
-                llinfos << "Initializing Multimedia...." << llendl;
+                LL_DEBUGS("AppInit") << "Initializing Multimedia...." << LL_ENDL;
                 set_startup_status(0.03f, "Initializing Multimedia...", gAgent.mMOTD.c_str());
                 display_startup();
                 LLViewerMedia::initClass();
@@ -656,7 +657,7 @@ BOOL idle_startup()
         if (STATE_LOGIN_SHOW == LLStartUp::getStartupState())
         {               
 
-                llinfos << "Initializing Window" << llendl;
+                LL_DEBUGS("AppInit") << "Initializing Window" << LL_ENDL;
                 
                 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
                 // Push our window frontmost
@@ -667,11 +668,13 @@ BOOL idle_startup()
                 if (show_connect_box)
                 {
                         // Load all the name information out of the login view
-                        LLPanelLogin::getFields(firstname, lastname, password, remember_password);
+                        // NOTE: Hits "Attempted getFields with no login view shown" warning, since we don't
+                        // show the login view until login_show() is called below.  
+                        // LLPanelLogin::getFields(firstname, lastname, password, remember_password);
 
                         if (gNoRender)
                         {
-                                llerrs << "Need to autologin or use command line with norender!" << llendl;
+                                LL_ERRS("AppInit") << "Need to autologin or use command line with norender!" << LL_ENDL;
                         }
                         // Make sure the process dialog doesn't hide things
                         gViewerWindow->setShowProgress(FALSE);
@@ -764,7 +767,7 @@ BOOL idle_startup()
                         }
                         gSavedSettings.setBOOL("RememberPassword", remember_password);
 
-                        llinfos << "Attempting login as: " << firstname << " " << lastname << llendl;
+                        LL_INFOS("AppInit") << "Attempting login as: " << firstname << " " << lastname << LL_ENDL;
                         gDebugInfo["LoginName"] = firstname + " " + lastname;   
                 }
 
@@ -812,22 +815,28 @@ BOOL idle_startup()
                         LLString server_label;
                         S32 domain_name_index;
                         BOOL user_picked_server = LLPanelLogin::getServer( server_label, domain_name_index );
-                        gGridChoice = (EGridInfo) domain_name_index;
-                        gSavedSettings.setS32("ServerChoice", gGridChoice);
-                        if (gGridChoice == GRID_INFO_OTHER)
+                        if((EGridInfo)domain_name_index == GRID_INFO_OTHER)
                         {
-                                gGridName = server_label;/* Flawfinder: ignore */
+                                // Since the grid chosen was an 'other', set the choice by string. 
+                                LLViewerLogin::getInstance()->setGridChoice(server_label);
+                        }
+                        else
+                        {
+                                // Set the choice according to index.
+                                LLViewerLogin::getInstance()->setGridChoice((EGridInfo)domain_name_index);
                         }
                         
                         if ( user_picked_server )
-                        {   // User picked a grid from the popup, so clear the stored urls and they will be re-generated from gGridChoice
+                        {   // User picked a grid from the popup, so clear the 
+                                // stored uris and they will be re-generated from the GridChoice
                                 sAuthUris.clear();
-                                LLAppViewer::instance()->resetURIs();
+                                LLViewerLogin::getInstance()->resetURIs();
                         }
                         
                         LLString location;
                         LLPanelLogin::getLocation( location );
                         LLURLSimString::setString( location );
+
                         // END TODO
                         LLPanelLogin::close();
                 }
@@ -884,7 +893,7 @@ BOOL idle_startup()
 
                 // Poke the VFS, which could potentially block for a while if
                 // Windows XP is acting up
-                set_startup_status(0.07f, "Verifying cache files (can take 60-90 seconds)...", NULL);
+                set_startup_status(0.07f, LLTrans::getString("LoginVerifyingCache").c_str(), NULL);
                 display_startup();
 
                 gVFS->pokeFiles();
@@ -907,10 +916,9 @@ BOOL idle_startup()
         if(STATE_LOGIN_AUTH_INIT == LLStartUp::getStartupState())
         {
 //#define LL_MINIMIAL_REQUESTED_OPTIONS
-                gDebugInfo["GridName"] = gGridInfo[gGridChoice].mLabel;
+                gDebugInfo["GridName"] = LLViewerLogin::getInstance()->getGridLabel();
 
                 // *Note: this is where gUserAuth used to be created.
-
                 requested_options.clear();
                 requested_options.push_back("inventory-root");
                 requested_options.push_back("inventory-skeleton");
@@ -942,7 +950,8 @@ BOOL idle_startup()
                         gSavedSettings.setBOOL("UseDebugMenus", TRUE);
                         requested_options.push_back("god-connect");
                 }
-                const std::vector<std::string>& uris = LLAppViewer::instance()->getLoginURIs();
+                std::vector<std::string> uris;
+                LLViewerLogin::getInstance()->getLoginURIs(uris);
                 std::vector<std::string>::const_iterator iter, end;
                 for (iter = uris.begin(), end = uris.end(); iter != end; ++iter)
                 {
@@ -953,15 +962,16 @@ BOOL idle_startup()
                 }
                 sAuthUriNum = 0;
                 auth_method = "login_to_simulator";
-                auth_desc = "Logging in.  ";
-                auth_desc += LLAppViewer::instance()->getSecondLifeTitle();
-                auth_desc += " may appear frozen.  Please wait.";
+                
+                LLString::format_map_t args;
+                args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
+                auth_desc = LLTrans::getString("LoginInProgress", args).c_str();
                 LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
         }
 
         if (STATE_LOGIN_AUTHENTICATE == LLStartUp::getStartupState())
         {
-                lldebugs << "STATE_LOGIN_AUTHENTICATE" << llendl;
+                LL_DEBUGS("AppInit") << "STATE_LOGIN_AUTHENTICATE" << LL_ENDL;
                 set_startup_status(progress, auth_desc.c_str(), auth_message.c_str());
                 progress += 0.02f;
                 display_startup();
@@ -1021,7 +1031,7 @@ BOOL idle_startup()
 
         if(STATE_LOGIN_NO_DATA_YET == LLStartUp::getStartupState())
         {
-                //lldebugs << "STATE_LOGIN_NO_DATA_YET" << llendl;
+                LL_DEBUGS("AppInit") << "STATE_LOGIN_NO_DATA_YET" << LL_ENDL;
                 // If we get here we have gotten past the potential stall
                 // in curl, so take "may appear frozen" out of progress bar. JC
                 auth_desc = "Logging in...";
@@ -1035,7 +1045,7 @@ BOOL idle_startup()
                 LLUserAuth::UserAuthcode error = LLUserAuth::getInstance()->authResponse();
                 if(LLUserAuth::E_NO_RESPONSE_YET == error)
                 {
-                        //llinfos << "waiting..." << llendl;
+                        LL_DEBUGS("AppInit") << "waiting..." << LL_ENDL;
                         return do_normal_idle;
                 }
                 LLStartUp::setStartupState( STATE_LOGIN_DOWNLOADING );
@@ -1046,7 +1056,7 @@ BOOL idle_startup()
 
         if(STATE_LOGIN_DOWNLOADING == LLStartUp::getStartupState())
         {
-                lldebugs << "STATE_LOGIN_DOWNLOADING" << llendl;
+                LL_DEBUGS("AppInit") << "STATE_LOGIN_DOWNLOADING" << LL_ENDL;
                 // Process messages to keep from dropping circuit.
                 LLMessageSystem* msg = gMessageSystem;
                 while (msg->checkAllMessages(gFrameCount, gServicePump))
@@ -1056,18 +1066,18 @@ BOOL idle_startup()
                 LLUserAuth::UserAuthcode error = LLUserAuth::getInstance()->authResponse();
                 if(LLUserAuth::E_DOWNLOADING == error)
                 {
-                        //llinfos << "downloading..." << llendl;
+                        LL_DEBUGS("AppInit") << "downloading..." << LL_ENDL;
                         return do_normal_idle;
                 }
                 LLStartUp::setStartupState( STATE_LOGIN_PROCESS_RESPONSE );
                 progress += 0.01f;
-                set_startup_status(progress, "Processing Response...", auth_message.c_str());
+                set_startup_status(progress, LLTrans::getString("LoginProcessingResponse").c_str(), auth_message.c_str());
                 return do_normal_idle;
         }
 
         if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState())
         {
-                lldebugs << "STATE_LOGIN_PROCESS_RESPONSE" << llendl;
+                LL_DEBUGS("AppInit") << "STATE_LOGIN_PROCESS_RESPONSE" << LL_ENDL;
                 std::ostringstream emsg;
                 BOOL quit = FALSE;
                 const char* login_response = NULL;
@@ -1089,18 +1099,18 @@ BOOL idle_startup()
                         }
                         else if(login_response && (0 == strcmp(login_response, "indeterminate")))
                         {
-                                llinfos << "Indeterminate login..." << llendl;
+                                LL_INFOS("AppInit") << "Indeterminate login..." << LL_ENDL;
                                 sAuthUris = LLSRV::rewriteURI(LLUserAuth::getInstance()->getResponse("next_url"));
                                 sAuthUriNum = 0;
                                 auth_method = LLUserAuth::getInstance()->getResponse("next_method");
                                 auth_message = LLUserAuth::getInstance()->getResponse("message");
                                 if(auth_method.substr(0, 5) == "login")
                                 {
-                                        auth_desc.assign("Authenticating...");
+                                        auth_desc.assign(LLTrans::getString("LoginAuthenticating").c_str());
                                 }
                                 else
                                 {
-                                        auth_desc.assign("Performing account maintenance...");
+                                        auth_desc.assign(LLTrans::getString("LoginMaintenance").c_str());
                                 }
                                 // ignoring the duration & options array for now.
                                 // Go back to authenticate.
@@ -1136,7 +1146,7 @@ BOOL idle_startup()
                                 {
                                         if (show_connect_box)
                                         {
-                                                llinfos << "Need tos agreement" << llendl;
+                                                LL_DEBUGS("AppInit") << "Need tos agreement" << LL_ENDL;
                                                 LLStartUp::setStartupState( STATE_UPDATE_CHECK );
                                                 LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_TOS,
                                                                                                                                         message_response);
@@ -1153,7 +1163,7 @@ BOOL idle_startup()
                                 {
                                         if (show_connect_box)
                                         {
-                                                llinfos << "Need critical message" << llendl;
+                                                LL_DEBUGS("AppInit") << "Need critical message" << LL_ENDL;
                                                 LLStartUp::setStartupState( STATE_UPDATE_CHECK );
                                                 LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_CRITICAL_MESSAGE,
                                                                                                                                         message_response);
@@ -1188,7 +1198,7 @@ BOOL idle_startup()
                                 }
                                 if(reason_response && (0 == strcmp(reason_response, "optional")))
                                 {
-                                        llinfos << "Login got optional update" << llendl;
+                                        LL_DEBUGS("AppInit") << "Login got optional update" << LL_ENDL;
                                         auth_message = LLUserAuth::getInstance()->getResponse("message");
                                         if (show_connect_box)
                                         {
@@ -1213,9 +1223,9 @@ BOOL idle_startup()
                         } else {
                                 sAuthUriNum++;
                                 std::ostringstream s;
-                                s << "Previous login attempt failed. Logging in, attempt "
-                                  << (sAuthUriNum + 1) << ".  ";
-                                auth_desc = s.str();
+                                LLString::format_map_t args;
+                                args["[NUMBER]"] = sAuthUriNum + 1;
+                                auth_desc = LLTrans::getString("LoginAttempt", args).c_str();
                                 LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
                                 return do_normal_idle;
                         }
@@ -1451,8 +1461,8 @@ BOOL idle_startup()
                         {
                                 if (gNoRender)
                                 {
-                                        llinfos << "Bad login - missing return values" << llendl;
-                                        llinfos << emsg << llendl;
+                                        LL_WARNS("AppInit") << "Bad login - missing return values" << LL_ENDL;
+                                        LL_WARNS("AppInit") << emsg << LL_ENDL;
                                         exit(0);
                                 }
                                 // Bounce back to the login screen.
@@ -1471,8 +1481,8 @@ BOOL idle_startup()
                 {
                         if (gNoRender)
                         {
-                                llinfos << "Failed to login!" << llendl;
-                                llinfos << emsg << llendl;
+                                LL_WARNS("AppInit") << "Failed to login!" << LL_ENDL;
+                                LL_WARNS("AppInit") << emsg << LL_ENDL;
                                 exit(0);
                         }
                         // Bounce back to the login screen.
@@ -1493,7 +1503,7 @@ BOOL idle_startup()
         //---------------------------------------------------------------------
         if (STATE_WORLD_INIT == LLStartUp::getStartupState())
         {
-                set_startup_status(0.40f, "Initializing World...", gAgent.mMOTD.c_str());
+                set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld").c_str(), gAgent.mMOTD.c_str());
                 display_startup();
                 // We should have an agent id by this point.
                 llassert(!(gAgentID == LLUUID::null));
@@ -1541,11 +1551,11 @@ BOOL idle_startup()
                 LLWorld::getInstance()->addRegion(first_sim_handle, first_sim);
 
                 LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(first_sim_handle);
-                llinfos << "Adding initial simulator " << regionp->getOriginGlobal() << llendl;
+                LL_INFOS("AppInit") << "Adding initial simulator " << regionp->getOriginGlobal() << LL_ENDL;
                 
                 LLStartUp::setStartupState( STATE_SEED_GRANTED_WAIT );
                 regionp->setSeedCapability(first_sim_seed_cap);
-                llinfos << "Waiting for seed grant ...." << llendl;
+                LL_DEBUGS("AppInit") << "Waiting for seed grant ...." << LL_ENDL;
                 
                 // Set agent's initial region to be the one we just created.
                 gAgent.setRegion(regionp);
@@ -1613,7 +1623,7 @@ BOOL idle_startup()
                 //
                 // Set message handlers
                 //
-                llinfos << "Initializing communications..." << llendl;
+                LL_INFOS("AppInit") << "Initializing communications..." << LL_ENDL;
 
                 // register callbacks for messages. . . do this after initial handshake to make sure that we don't catch any unwanted
                 register_viewer_callbacks(gMessageSystem);
@@ -1662,7 +1672,7 @@ BOOL idle_startup()
 
                 // Sets up the parameters for the first simulator
 
-                llinfos << "Initializing camera..." << llendl;
+                LL_DEBUGS("AppInit") << "Initializing camera..." << LL_ENDL;
                 gFrameTime    = totalTime();
                 F32 last_time = gFrameTimeSeconds;
                 gFrameTimeSeconds = (S64)(gFrameTime - gStartTime)/SEC_TO_MICROSEC;
@@ -1697,19 +1707,19 @@ BOOL idle_startup()
                 // Initialize global class data needed for surfaces (i.e. textures)
                 if (!gNoRender)
                 {
-                        llinfos << "Initializing sky..." << llendl;
+                        LL_DEBUGS("AppInit") << "Initializing sky..." << LL_ENDL;
                         // Initialize all of the viewer object classes for the first time (doing things like texture fetches.
                         gSky.init(initial_sun_direction);
                 }
 
-                llinfos << "Decoding images..." << llendl;
+                LL_DEBUGS("AppInit") << "Decoding images..." << LL_ENDL;
                 // For all images pre-loaded into viewer cache, decode them.
                 // Need to do this AFTER we init the sky
                 const S32 DECODE_TIME_SEC = 2;
                 for (int i = 0; i < DECODE_TIME_SEC; i++)
                 {
                         F32 frac = (F32)i / (F32)DECODE_TIME_SEC;
-                        set_startup_status(0.45f + frac*0.1f, "Decoding images...", gAgent.mMOTD.c_str());
+                        set_startup_status(0.45f + frac*0.1f, LLTrans::getString("LoginDecodingImages").c_str(), gAgent.mMOTD.c_str());
                         display_startup();
                         gImageList.decodeAllImages(1.f);
                 }
@@ -1720,14 +1730,14 @@ BOOL idle_startup()
                 LLMessageSystem* msg = gMessageSystem;
                 if (!msg->mOurCircuitCode)
                 {
-                        llwarns << "Attempting to connect to simulator with a zero circuit code!" << llendl;
+                        LL_WARNS("AppInit") << "Attempting to connect to simulator with a zero circuit code!" << LL_ENDL;
                 }
 
                 gUseCircuitCallbackCalled = FALSE;
 
                 msg->enableCircuit(first_sim, TRUE);
                 // now, use the circuit info to tell simulator about us!
-                llinfos << "viewer: UserLoginLocationReply() Enabling " << first_sim << " with code " << msg->mOurCircuitCode << llendl;
+                LL_INFOS("AppInit") << "viewer: UserLoginLocationReply() Enabling " << first_sim << " with code " << msg->mOurCircuitCode << LL_ENDL;
                 msg->newMessageFast(_PREHASH_UseCircuitCode);
                 msg->nextBlockFast(_PREHASH_CircuitCode);
                 msg->addU32Fast(_PREHASH_Code, msg->mOurCircuitCode);
@@ -1753,8 +1763,8 @@ BOOL idle_startup()
         //---------------------------------------------------------------------
         if(STATE_WORLD_WAIT == LLStartUp::getStartupState())
         {
-                //llinfos << "Waiting for simulator ack...." << llendl;
-                set_startup_status(0.59f, "Waiting for region handshake...", gAgent.mMOTD.c_str());
+                LL_DEBUGS("AppInit") << "Waiting for simulator ack...." << LL_ENDL;
+                set_startup_status(0.59f, LLTrans::getString("LoginWaitingForRegionHandshake").c_str(), gAgent.mMOTD.c_str());
                 if(gGotUseCircuitCodeAck)
                 {
                         LLStartUp::setStartupState( STATE_AGENT_SEND );
@@ -1772,8 +1782,8 @@ BOOL idle_startup()
         //---------------------------------------------------------------------
         if (STATE_AGENT_SEND == LLStartUp::getStartupState())
         {
-                llinfos << "Connecting to region..." << llendl;
-                set_startup_status(0.60f, "Connecting to region...", gAgent.mMOTD.c_str());
+                LL_DEBUGS("AppInit") << "Connecting to region..." << LL_ENDL;
+                set_startup_status(0.60f, LLTrans::getString("LoginConnectingToRegion").c_str(), gAgent.mMOTD.c_str());
                 // register with the message system so it knows we're
                 // expecting this message
                 LLMessageSystem* msg = gMessageSystem;
@@ -1824,8 +1834,8 @@ BOOL idle_startup()
                         }
                         else
                         {
-                                //llinfos << "Awaiting AvatarInitComplete, got "
-                                //<< msg->getMessageName() << llendl;
+                                LL_DEBUGS("AppInit") << "Awaiting AvatarInitComplete, got "
+                                << msg->getMessageName() << LL_ENDL;
                         }
                 }
                 msg->processAcks();
@@ -1877,7 +1887,7 @@ BOOL idle_startup()
                 {
                         if(!gInventory.loadSkeleton(options, gInventoryLibraryOwner))
                         {
-                                llwarns << "Problem loading inventory-skel-lib" << llendl;
+                                LL_WARNS("AppInit") << "Problem loading inventory-skel-lib" << LL_ENDL;
                         }
                 }
                 options.clear();
@@ -1885,8 +1895,7 @@ BOOL idle_startup()
                 {
                         if(!gInventory.loadSkeleton(options, gAgent.getID()))
                         {
-                                llwarns << "Problem loading inventory-skel-targets"
-                                                << llendl;
+                                LL_WARNS("AppInit") << "Problem loading inventory-skel-targets" << LL_ENDL;
                         }
                 }
 
@@ -2038,17 +2047,17 @@ BOOL idle_startup()
                         if (rate_bps > FASTER_RATE_BPS
                                 && rate_bps > max_bandwidth)
                         {
-                                llinfos << "Fast network connection, increasing max bandwidth to " 
+                                LL_DEBUGS("AppInit") << "Fast network connection, increasing max bandwidth to " 
                                         << FASTER_RATE_BPS/1024.f 
-                                        << " kbps" << llendl;
+                                        << " kbps" << LL_ENDL;
                                 gViewerThrottle.setMaxBandwidth(FASTER_RATE_BPS / 1024.f);
                         }
                         else if (rate_bps > FAST_RATE_BPS
                                 && rate_bps > max_bandwidth)
                         {
-                                llinfos << "Fast network connection, increasing max bandwidth to " 
+                                LL_DEBUGS("AppInit") << "Fast network connection, increasing max bandwidth to " 
                                         << FAST_RATE_BPS/1024.f 
-                                        << " kbps" << llendl;
+                                        << " kbps" << LL_ENDL;
                                 gViewerThrottle.setMaxBandwidth(FAST_RATE_BPS / 1024.f);
                         }
                 }
@@ -2080,8 +2089,8 @@ BOOL idle_startup()
                         LLUserAuth::options_t gesture_options;
                         if (LLUserAuth::getInstance()->getOptions("gestures", gesture_options))
                         {
-                                llinfos << "Gesture Manager loading " << gesture_options.size()
-                                        << llendl;
+                                LL_DEBUGS("AppInit") << "Gesture Manager loading " << gesture_options.size()
+                                        << LL_ENDL;
                                 std::vector<LLUUID> item_ids;
                                 LLUserAuth::options_t::iterator resp_it;
                                 for (resp_it = gesture_options.begin();
@@ -2134,7 +2143,7 @@ BOOL idle_startup()
                 msg->setHandlerFuncFast(_PREHASH_AttachedSound,                         process_attached_sound);
                 msg->setHandlerFuncFast(_PREHASH_AttachedSoundGainChange,       process_attached_sound_gain_change);
 
-                llinfos << "Initialization complete" << llendl;
+                LL_DEBUGS("AppInit") << "Initialization complete" << LL_ENDL;
 
                 gRenderStartTime.reset();
                 gForegroundTime.reset();
@@ -2249,7 +2258,7 @@ BOOL idle_startup()
                 {
                         update_texture_fetch();
                         set_startup_status(0.f + 0.25f * wearables_time / MAX_WEARABLES_TIME,
-                                                         "Downloading clothing...",
+                                                         LLTrans::getString("LoginDownloadingClothing").c_str(),
                                                          gAgent.mMOTD.c_str());
                 }
                 return do_normal_idle;
@@ -2271,7 +2280,7 @@ BOOL idle_startup()
                 gViewerWindow->showCursor();
                 gViewerWindow->getWindow()->resetBusyCount();
                 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
-                //llinfos << "Done releasing bitmap" << llendl;
+                LL_DEBUGS("AppInit") << "Done releasing bitmap" << LL_ENDL;
                 gViewerWindow->setShowProgress(FALSE);
                 gViewerWindow->setProgressCancelButtonVisible(FALSE, "");
 
@@ -2293,7 +2302,7 @@ BOOL idle_startup()
                 if (gSavedSettings.getBOOL("StatsAutoRun"))
                 {
                         LLUUID id;
-                        llinfos << "Starting automatic playback" << llendl;
+                        LL_DEBUGS("AppInit") << "Starting automatic playback" << LL_ENDL;
                         gAgentPilot.startPlayback();
                 }
 
@@ -2309,9 +2318,9 @@ BOOL idle_startup()
                 // Unmute audio if desired and setup volumes.
                 // This is a not-uncommon crash site, so surround it with
                 // llinfos output to aid diagnosis.
-                llinfos << "Doing first audio_update_volume..." << llendl;
+                LL_INFOS("AppInit") << "Doing first audio_update_volume..." << LL_ENDL;
                 audio_update_volume();
-                llinfos << "Done first audio_update_volume." << llendl;
+                LL_INFOS("AppInit") << "Done first audio_update_volume." << LL_ENDL;
 
                 // reset keyboard focus to sane state of pointing at world
                 gFocusMgr.setKeyboardFocus(NULL);
@@ -2320,10 +2329,12 @@ BOOL idle_startup()
                 gDebugView->mFastTimerView->setVisible(TRUE);
 #endif
 
+                LLAppViewer::instance()->startMainloopTimeout();
+
                 return do_normal_idle;
         }
 
-        llwarns << "Reached end of idle_startup for state " << LLStartUp::getStartupState() << llendl;
+        LL_WARNS("AppInit") << "Reached end of idle_startup for state " << LLStartUp::getStartupState() << LL_ENDL;
         return do_normal_idle;
 }
 
@@ -2333,7 +2344,7 @@ BOOL idle_startup()
 
 void login_show()
 {
-        llinfos << "Initializing Login Screen" << llendl;
+        LL_INFOS("AppInit") << "Initializing Login Screen" << LL_ENDL;
 
 #ifdef LL_RELEASE_FOR_DOWNLOAD
         BOOL bUseDebugLogin = gSavedSettings.getBOOL("UseDebugLogin");
@@ -2347,35 +2358,15 @@ void login_show()
 
         // UI textures have been previously loaded in doPreloadImages()
         
-        llinfos << "Setting Servers" << llendl;
+        LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL;
 
-        if( GRID_INFO_OTHER == gGridChoice )
-        {
-                   LLPanelLogin::addServer( gGridName.c_str(), GRID_INFO_OTHER );
-        }
-        else
+        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel().c_str(), LLViewerLogin::getInstance()->getGridChoice());
+
+        LLViewerLogin* vl = LLViewerLogin::getInstance();
+        for(int grid_index = GRID_INFO_ADITI; grid_index < GRID_INFO_OTHER; ++grid_index)
         {
-                   LLPanelLogin::addServer( gGridInfo[gGridChoice].mLabel, gGridChoice );
+                LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index).c_str(), grid_index);
         }
-
-        // Arg!  We hate loops!
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_ADITI].mLabel,        GRID_INFO_ADITI );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_AGNI].mLabel, GRID_INFO_AGNI );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_ARUNA].mLabel,        GRID_INFO_ARUNA );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_DURGA].mLabel,        GRID_INFO_DURGA );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_GANGA].mLabel,        GRID_INFO_GANGA );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_MITRA].mLabel,       GRID_INFO_MITRA );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_MOHINI].mLabel,       GRID_INFO_MOHINI );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_NANDI].mLabel,       GRID_INFO_NANDI );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_RADHA].mLabel,       GRID_INFO_RADHA );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_RAVI].mLabel,       GRID_INFO_RAVI );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_SIVA].mLabel, GRID_INFO_SIVA );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_SHAKTI].mLabel,       GRID_INFO_SHAKTI );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_SOMA].mLabel, GRID_INFO_SOMA );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_UMA].mLabel,  GRID_INFO_UMA );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_VAAK].mLabel, GRID_INFO_VAAK );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_YAMI].mLabel, GRID_INFO_YAMI );
-        LLPanelLogin::addServer( gGridInfo[GRID_INFO_LOCAL].mLabel,        GRID_INFO_LOCAL );
 }
 
 // Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
@@ -2416,7 +2407,7 @@ void login_callback(S32 option, void *userdata)
         }
         else
         {
-                llwarns << "Unknown login button clicked" << llendl;
+                LL_WARNS("AppInit") << "Unknown login button clicked" << LL_ENDL;
         }
 }
 
@@ -2437,7 +2428,7 @@ LLString load_password_from_disk()
 
         std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
                                                                                                            "password.dat");
-        FILE* fp = LLFile::fopen(filepath.c_str(), "rb");               /* Flawfinder: ignore */
+        LLFILE* fp = LLFile::fopen(filepath.c_str(), "rb");             /* Flawfinder: ignore */
         if (!fp)
         {
                 return hashed_password;
@@ -2484,7 +2475,7 @@ void save_password_to_disk(const char* hashed_password)
         }
         else
         {
-                FILE* fp = LLFile::fopen(filepath.c_str(), "wb");               /* Flawfinder: ignore */
+                LLFILE* fp = LLFile::fopen(filepath.c_str(), "wb");             /* Flawfinder: ignore */
                 if (!fp)
                 {
                         return;
@@ -2501,7 +2492,7 @@ void save_password_to_disk(const char* hashed_password)
 
                 if (fwrite(buffer, HASHED_LENGTH, 1, fp) != 1)
                 {
-                        llwarns << "Short write" << llendl;
+                        LL_WARNS("AppInit") << "Short write" << LL_ENDL;
                 }
 
                 fclose(fp);
@@ -2551,7 +2542,7 @@ void first_run_dialog_callback(S32 option, void* userdata)
 {
         if (0 == option)
         {
-                llinfos << "First run dialog cancelling" << llendl;
+                LL_DEBUGS("AppInit") << "First run dialog cancelling" << LL_ENDL;
                 LLWeb::loadURL( CREATE_ACCOUNT_URL );
         }
 
@@ -2584,7 +2575,7 @@ void login_alert_status(S32 option, void* user_data)
             LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
             break;
         default:
-            llwarns << "Missing case in login_alert_status switch" << llendl;
+            LL_WARNS("AppInit") << "Missing case in login_alert_status switch" << LL_ENDL;
     }
 
         LLPanelLogin::giveFocus();
@@ -2692,7 +2683,7 @@ void update_dialog_callback(S32 option, void *userdata)
 #endif
         // *TODO change userserver to be grid on both viewer and sim, since
         // userserver no longer exists.
-        query_map["userserver"] = gGridName;
+        query_map["userserver"] = LLViewerLogin::getInstance()->getGridLabel();
         query_map["channel"] = gSavedSettings.getString("VersionChannelName");
         // *TODO constantize this guy
         LLURI update_url = LLURI::buildHTTP("secondlife.com", 80, "update.php", query_map);
@@ -2702,7 +2693,7 @@ void update_dialog_callback(S32 option, void *userdata)
         if (update_exe_path.empty())
         {
                 // We're hosed, bail
-                llwarns << "LLDir::getTempFilename() failed" << llendl;
+                LL_WARNS("AppInit") << "LLDir::getTempFilename() failed" << LL_ENDL;
                 LLAppViewer::instance()->forceQuit();
                 return;
         }
@@ -2713,14 +2704,14 @@ void update_dialog_callback(S32 option, void *userdata)
         updater_source += gDirUtilp->getDirDelimiter();
         updater_source += "updater.exe";
 
-        llinfos << "Calling CopyFile source: " << updater_source.c_str()
+        LL_DEBUGS("AppInit") << "Calling CopyFile source: " << updater_source.c_str()
                         << " dest: " << update_exe_path
-                        << llendl;
+                        << LL_ENDL;
 
 
         if (!CopyFileA(updater_source.c_str(), update_exe_path.c_str(), FALSE))
         {
-                llinfos << "Unable to copy the updater!" << llendl;
+                LL_WARNS("AppInit") << "Unable to copy the updater!" << LL_ENDL;
                 LLAppViewer::instance()->forceQuit();
                 return;
         }
@@ -2758,14 +2749,14 @@ void update_dialog_callback(S32 option, void *userdata)
                 params << " -program \"" << program_name << "\"";
         }
 
-        llinfos << "Calling updater: " << update_exe_path << " " << params.str() << llendl;
+        LL_DEBUGS("AppInit") << "Calling updater: " << update_exe_path << " " << params.str() << LL_ENDL;
 
         //Explicitly remove the marker file, otherwise we pass the lock onto the child process and things get weird.
         LLAppViewer::instance()->removeMarkerFile(); // In case updater fails
         
         // Use spawn() to run asynchronously
         int retval = _spawnl(_P_NOWAIT, update_exe_path.c_str(), update_exe_path.c_str(), params.str().c_str(), NULL);
-        llinfos << "Spawn returned " << retval << llendl;
+        LL_DEBUGS("AppInit") << "Spawn returned " << retval << LL_ENDL;
 
 #elif LL_DARWIN
         // if a sim name was passed in via command line parameter (typically through a SLURL)
@@ -2783,11 +2774,8 @@ void update_dialog_callback(S32 option, void *userdata)
         update_exe_path += LLAppViewer::instance()->getSecondLifeTitle();
         update_exe_path += "\" &";
 
-        llinfos << "Calling updater: " << update_exe_path << llendl;
+        LL_DEBUGS("AppInit") << "Calling updater: " << update_exe_path << LL_ENDL;
         
-        // *REMOVE:Mani The following call is handled through ~LLAppViewer.
-        // remove_marker_file(); // In case updater fails
-
         // Run the auto-updater.
         system(update_exe_path.c_str());                /* Flawfinder: ignore */
         
@@ -2795,10 +2783,6 @@ void update_dialog_callback(S32 option, void *userdata)
         OSMessageBox("Automatic updating is not yet implemented for Linux.\n"
                 "Please download the latest version from www.secondlife.com.",
                 NULL, OSMB_OK);
-
-        // *REMOVE:Mani The following call is handled through ~LLAppViewer.
-        // remove_marker_file();
-        
 #endif
         LLAppViewer::instance()->forceQuit();
 }
@@ -2813,7 +2797,7 @@ void use_circuit_callback(void**, S32 result)
                 if (result)
                 {
                         // Make sure user knows something bad happened. JC
-                        llinfos << "Backing up to login screen!" << llendl;
+                        LL_WARNS("AppInit") << "Backing up to login screen!" << LL_ENDL;
                         gViewerWindow->alertXml("LoginPacketNeverReceived",
                                 login_alert_status, NULL);
                         reset_login();
@@ -2981,7 +2965,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
         //msg->setHandlerFunc("DirPicksReply",  LLPanelDirBrowser::processDirPicksReply);
         msg->setHandlerFunc("DirClassifiedReply",  LLPanelDirBrowser::processDirClassifiedReply);
         msg->setHandlerFunc("DirLandReply",   LLPanelDirBrowser::processDirLandReply);
-        msg->setHandlerFunc("DirPopularReply",LLPanelDirBrowser::processDirPopularReply);
+        //msg->setHandlerFunc("DirPopularReply",LLPanelDirBrowser::processDirPopularReply);
 
         msg->setHandlerFunc("AvatarPickerReply", LLFloaterAvatarPicker::processAvatarPickerReply);
 
@@ -3660,10 +3644,10 @@ void init_start_screen(S32 location_id)
         if (gStartImageGL.notNull())
         {
                 gStartImageGL = NULL;
-                llinfos << "re-initializing start screen" << llendl;
+                LL_INFOS("AppInit") << "re-initializing start screen" << LL_ENDL;
         }
 
-        llinfos << "Loading startup bitmap..." << llendl;
+        LL_DEBUGS("AppInit") << "Loading startup bitmap..." << LL_ENDL;
 
         LLString temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
 
@@ -3682,12 +3666,12 @@ void init_start_screen(S32 location_id)
         // driver bug
         if(!gSavedSettings.getBOOL("UseStartScreen"))
         {
-                llinfos << "Bitmap load disabled" << llendl;
+                LL_INFOS("AppInit")  << "Bitmap load disabled" << LL_ENDL;
                 return;
         }
         else if(!start_image_bmp->load(temp_str) )
         {
-                llinfos << "Bitmap load failed" << llendl;
+                LL_WARNS("AppInit") << "Bitmap load failed" << LL_ENDL;
                 return;
         }
 
@@ -3698,7 +3682,7 @@ void init_start_screen(S32 location_id)
         LLPointer<LLImageRaw> raw = new LLImageRaw;
         if (!start_image_bmp->decode(raw, 0.0f))
         {
-                llinfos << "Bitmap decode failed" << llendl;
+                LL_WARNS("AppInit") << "Bitmap decode failed" << LL_ENDL;
                 gStartImageGL = NULL;
                 return;
         }
@@ -3711,7 +3695,7 @@ void init_start_screen(S32 location_id)
 // frees the bitmap
 void release_start_screen()
 {
-        //llinfos << "Releasing bitmap..." << llendl;
+        LL_DEBUGS("AppInit") << "Releasing bitmap..." << LL_ENDL;
         gStartImageGL = NULL;
 }
 
@@ -3719,7 +3703,7 @@ void release_start_screen()
 // static
 void LLStartUp::setStartupState( S32 state )
 {
-        llinfos << "Startup state changing from " << gStartupState << " to " << state << llendl;
+        LL_INFOS("AppInit") << "Startup state changing from " << gStartupState << " to " << state << LL_ENDL;
         gStartupState = state;
 }