1 files changed, 248 insertions, 784 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index d747bd2..4d35242 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -120,6 +121,7 @@
 #include "llinventorymodel.h"
 #include "llinventoryview.h"
 #include "llkeyboard.h"
+#include "llloginhandler.h"                     // gLoginHandler, SLURL support
 #include "llpanellogin.h"
 #include "llmutelist.h"
 #include "llnotify.h"
@@ -134,12 +136,14 @@
 #include "llpanelgroupnotices.h"
 #include "llpreview.h"
 #include "llpreviewscript.h"
+#include "llproductinforequest.h"
 #include "llsecondlifeurls.h"
 #include "llselectmgr.h"
 #include "llsky.h"
 #include "llsrv.h"
 #include "llstatview.h"
 #include "lltrans.h"
+#include "llstatusbar.h"                // sendMoneyBalanceRequest(), owns L$ balance
 #include "llsurface.h"
 #include "lltexturecache.h"
 #include "lltexturefetch.h"
@@ -240,22 +244,19 @@ bool LLStartUp::mShouldAutoLogin = false;
 
 void login_show();
 void login_callback(S32 option, void* userdata);
-std::string load_password_from_disk();
-void save_password_to_disk(const char* hashed_password);
 bool is_hex_string(U8* str, S32 len);
 void show_first_run_dialog();
-void first_run_dialog_callback(S32 option, void* userdata);
+bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);
 void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
-void login_alert_status(S32 option, void* user_data);
+bool login_alert_status(const LLSD& notification, const LLSD& response);
 void update_app(BOOL mandatory, const std::string& message);
-void update_dialog_callback(S32 option, void *userdata);
+bool update_dialog_callback(const LLSD& notification, const LLSD& response);
 void login_packet_failed(void**, S32 result);
 void use_circuit_callback(void**, S32 result);
 void register_viewer_callbacks(LLMessageSystem* msg);
 void init_stat_view();
 void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32);
-void dialog_choose_gender_first_start();
-void callback_choose_gender(S32 option, void* userdata);
+bool callback_choose_gender(const LLSD& notification, const LLSD& response);
 void init_start_screen(S32 location_id);
 void release_start_screen();
 void apply_udp_blacklist(const std::string& csv);
@@ -360,7 +361,6 @@ bool idle_startup()
         static S32  location_which = START_LOCATION_ID_LAST;
 
         static bool show_connect_box = true;
-        static BOOL remember_password = TRUE;
 
         static bool stipend_since_login = false;
 
@@ -401,16 +401,16 @@ bool idle_startup()
 
                 if (LLFeatureManager::getInstance()->isSafe())
                 {
-                        gViewerWindow->alertXml("DisplaySetToSafe");
+                        LLNotifications::instance().add("DisplaySetToSafe");
                 }
                 else if ((gSavedSettings.getS32("LastFeatureVersion") < LLFeatureManager::getInstance()->getVersion()) &&
                                  (gSavedSettings.getS32("LastFeatureVersion") != 0))
                 {
-                        gViewerWindow->alertXml("DisplaySetToRecommended");
+                        LLNotifications::instance().add("DisplaySetToRecommended");
                 }
                 else if (!gViewerWindow->getInitAlert().empty())
                 {
-                        gViewerWindow->alertXml(gViewerWindow->getInitAlert());
+                        LLNotifications::instance().add(gViewerWindow->getInitAlert());
                 }
                         
                 gSavedSettings.setS32("LastFeatureVersion", LLFeatureManager::getInstance()->getVersion());
@@ -433,10 +433,11 @@ bool idle_startup()
                 }
                 if (!xml_ok)
                 {
-                        // *TODO:translate (maybe - very unlikely error message)
-                        // Note: alerts.xml may be invalid - if this gets translated it will need to be in the code
-                        std::string bad_xui_msg = "An error occured while updating Second Life. Please download the latest version from www.secondlife.com.";
-            LLAppViewer::instance()->earlyExit(bad_xui_msg);
+                        // If XML is bad, there's a good possibility that notifications.xml is ALSO bad.
+                        // If that's so, then we'll get a fatal error on attempting to load it, 
+                        // which will display a nontranslatable error message that says so.
+                        // Otherwise, we'll display a reasonable error message that IS translatable.
+                        LLAppViewer::instance()->earlyExit("BadInstallation");
                 }
                 //
                 // Statistics stuff
@@ -454,9 +455,9 @@ bool idle_startup()
 
                 if (ll_init_ares() == NULL || !gAres->isInitialized())
                 {
-                        LL_WARNS("AppInit") << "Could not start address resolution system" << LL_ENDL;
-                        std::string msg = LLTrans::getString("LoginFailedNoNetwork");
-                        LLAppViewer::instance()->earlyExit(msg);
+                        std::string diagnostic = "Could not start address resolution system";
+                        LL_WARNS("AppInit") << diagnostic << LL_ENDL;
+                        LLAppViewer::instance()->earlyExit("LoginFailedNoNetwork", LLSD().insert("DIAGNOSTIC", diagnostic));
                 }
                 
                 //
@@ -493,6 +494,14 @@ bool idle_startup()
                           }
 
                         LLHTTPSender::setDefaultSender(new LLNullHTTPSender());
+
+                        // TODO parameterize 
+                        const F32 circuit_heartbeat_interval = 5;
+                        const F32 circuit_timeout = 100;
+
+                        const LLUseCircuitCodeResponder* responder = NULL;
+                        bool failure_is_fatal = true;
+                        
                         if(!start_messaging_system(
                                    message_template_path,
                                    port,
@@ -500,11 +509,15 @@ bool idle_startup()
                                    LL_VERSION_MINOR,
                                    LL_VERSION_PATCH,
                                    FALSE,
-                                   std::string()))
+                                   std::string(),
+                                   responder,
+                                   failure_is_fatal,
+                                   circuit_heartbeat_interval,
+                                   circuit_timeout))
                         {
-                                std::string msg = LLTrans::getString("LoginFailedNoNetwork");
-                                msg.append(llformat(" Error: %d", gMessageSystem->getErrorCode()));
-                                LLAppViewer::instance()->earlyExit(msg);
+                                std::string diagnostic = llformat(" Error: %d", gMessageSystem->getErrorCode());
+                                LL_WARNS("AppInit") << diagnostic << LL_ENDL;
+                                LLAppViewer::instance()->earlyExit("LoginFailedNoNetwork", LLSD().insert("DIAGNOSTIC", diagnostic));
                         }
 
                         #if LL_WINDOWS
@@ -527,7 +540,7 @@ bool idle_startup()
                 }
                 else
                 {
-                        LLAppViewer::instance()->earlyExit("Message Template " + message_template_path + " not found.");
+                        LLAppViewer::instance()->earlyExit("MessageTemplateNotFound", LLSD().insert("PATH", message_template_path));
                 }
 
                 if(gMessageSystem && gMessageSystem->isOK())
@@ -658,16 +671,23 @@ bool idle_startup()
                 //
                 // Log on to system
                 //
-                if ((!gLoginHandler.mFirstName.empty() &&
-                         !gLoginHandler.mLastName.empty() &&
-                         !gLoginHandler.mWebLoginKey.isNull())          
-                        || gLoginHandler.parseDirectLogin(LLStartUp::sSLURLCommand) )
+                if (!LLStartUp::sSLURLCommand.empty())
                 {
-                        firstname = gLoginHandler.mFirstName;
-                        lastname = gLoginHandler.mLastName;
-                        web_login_key = gLoginHandler.mWebLoginKey;
+                        // this might be a secondlife:///app/login URL
+                        gLoginHandler.parseDirectLogin(LLStartUp::sSLURLCommand);
+                }
+                if (!gLoginHandler.getFirstName().empty()
+                        || !gLoginHandler.getLastName().empty()
+                        || !gLoginHandler.getWebLoginKey().isNull() )
+                {
+                        // We have at least some login information on a SLURL
+                        firstname = gLoginHandler.getFirstName();
+                        lastname = gLoginHandler.getLastName();
+                        web_login_key = gLoginHandler.getWebLoginKey();
 
-                        show_connect_box = false;
+                        // Show the login screen if we don't have everything
+                        show_connect_box = 
+                                firstname.empty() || lastname.empty() || web_login_key.isNull();
                 }
         else if((gSavedSettings.getLLSD("UserLoginInfo").size() == 3) && !LLStartUp::shouldAutoLogin())
         {
@@ -679,7 +699,6 @@ bool idle_startup()
                         char md5pass[33];               /* Flawfinder: ignore */
                         pass.hex_digest(md5pass);
                         password = md5pass;
-                        remember_password = gSavedSettings.getBOOL("RememberPassword");
                         
 #ifdef USE_VIEWER_AUTH
                         show_connect_box = true;
@@ -692,9 +711,8 @@ bool idle_startup()
                 {
                         firstname = gSavedSettings.getString("FirstName");
                         lastname = gSavedSettings.getString("LastName");
-                        password = load_password_from_disk();
+                        password = LLStartUp::loadPasswordFromDisk();
                         gSavedSettings.setBOOL("RememberPassword", TRUE);
-                        remember_password = TRUE;
                         
 #ifdef USE_VIEWER_AUTH
                         show_connect_box = true;
@@ -707,9 +725,7 @@ bool idle_startup()
                         // if not automatically logging in, display login dialog
                         firstname = gSavedSettings.getString("FirstName");
                         lastname = gSavedSettings.getString("LastName");
-                        password = load_password_from_disk();
-                        
-                        remember_password = gSavedSettings.getBOOL("RememberPassword");
+                        password = LLStartUp::loadPasswordFromDisk();
                         show_connect_box = true;
                 }
 
@@ -740,8 +756,6 @@ bool idle_startup()
                 sAuthUriNum = -1;
                 
                 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
-                // Push our window frontmost
-                gViewerWindow->getWindow()->show();
 
                 timeout_count = 0;
                 
@@ -755,7 +769,7 @@ bool idle_startup()
                         // Load all the name information out of the login view
                         // 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);
+                        // LLPanelLogin::getFields(firstname, lastname, password);
 
                         if (gNoRender)
                         {
@@ -767,7 +781,7 @@ bool idle_startup()
                         // Show the login dialog
                         login_show();
                         // connect dialog is already shown, so fill in the names
-                        LLPanelLogin::setFields( firstname, lastname, password, remember_password );
+                        LLPanelLogin::setFields( firstname, lastname, password);
 
                         LLPanelLogin::giveFocus();
 
@@ -802,6 +816,10 @@ bool idle_startup()
                 gLoginMenuBarView->setVisible( TRUE );
                 gLoginMenuBarView->setEnabled( TRUE );
 
+                // Push our window frontmost
+                gViewerWindow->getWindow()->show();
+                display_startup();
+
                 // DEV-16927.  The following code removes errant keystrokes that happen while the window is being 
                 // first made visible.
 #ifdef _WIN32
@@ -825,13 +843,14 @@ bool idle_startup()
         if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
         {
                 //reset the values that could have come in from a slurl
-                if (!gLoginHandler.mWebLoginKey.isNull())
+                if (!gLoginHandler.getWebLoginKey().isNull())
                 {
-                        firstname = gLoginHandler.mFirstName;
-                        lastname = gLoginHandler.mLastName;
-                        web_login_key = gLoginHandler.mWebLoginKey;
+                        firstname = gLoginHandler.getFirstName();
+                        lastname = gLoginHandler.getLastName();
+                        web_login_key = gLoginHandler.getWebLoginKey();
                 }
                 
+                /* Jacek - Grid manager stuff that's changed with 1.23
                 if(!gLoginHandler.mPassword.empty())
                 {
                         firstname = gLoginHandler.mFirstName;
@@ -842,13 +861,13 @@ bool idle_startup()
                         gLoginHandler.mLastName = "";
                         gLoginHandler.mPassword = "";
                         LLStartUp::setShouldAutoLogin(false);
-                }
+                }*/
                                 
                 if (show_connect_box)
                 {
                         // TODO if not use viewer auth
                         // Load all the name information out of the login view
-                        LLPanelLogin::getFields(firstname, lastname, password, remember_password);
+                        LLPanelLogin::getFields(&firstname, &lastname, &password);
                         // end TODO
          
                         // HACK: Try to make not jump on login
@@ -860,16 +879,6 @@ bool idle_startup()
                         gSavedSettings.setString("FirstName", firstname);
                         gSavedSettings.setString("LastName", lastname);
 
-                        if (remember_password)
-                        {
-                                   save_password_to_disk(password.c_str());
-                        }
-                        else
-                        {
-                                   save_password_to_disk(NULL);
-                        }
-                        gSavedSettings.setBOOL("RememberPassword", remember_password);
-
                         //LL_INFOS("AppInit") << "Attempting login as: " << firstname << " " << lastname << " " << password << LL_ENDL;
                         gDebugInfo["LoginName"] = firstname + " " + lastname;   
                 }
@@ -883,12 +892,12 @@ bool idle_startup()
         // Set PerAccountSettingsFile to the default value.
                 gSavedSettings.setString("PerAccountSettingsFile",
                         gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, 
-                                LLAppViewer::instance()->getSettingsFileName("PerAccount")
+                                LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount")
                                 )
                         );
 
                 // Overwrite default user settings with user settings                                                            
-                LLAppViewer::instance()->loadSettingsFromDirectory(LL_PATH_PER_SL_ACCOUNT);
+                LLAppViewer::instance()->loadSettingsFromDirectory("Account");
 
                 // Need to set the LastLogoff time here if we don't have one.  LastLogoff is used for "Recent Items" calculation
                 // and startup time is close enough if we don't have a real value.
@@ -1262,11 +1271,7 @@ bool idle_startup()
                                 reason_response = LLUserAuth::getInstance()->getResponse("reason");
                                 message_response = LLUserAuth::getInstance()->getResponse("message");
 
-                                if (gHideLinks && reason_response == "disabled")
-                                {
-                                        emsg << gDisabledMessage;
-                                }
-                                else if (!message_response.empty())
+                                if (!message_response.empty())
                                 {
                                         // XUI: fix translation for strings returned during login
                                         // We need a generic table for translations
@@ -1414,24 +1419,24 @@ bool idle_startup()
                         gSavedSettings.setString("FirstName", firstname);
                         gSavedSettings.setString("LastName", lastname);
 
-                        if (remember_password)
+                        if (gSavedSettings.getBOOL("RememberPassword"))
                         {
-                                   save_password_to_disk(password.c_str());
+                                // Successful login means the password is valid, so save it.
+                                LLStartUp::savePasswordToDisk(password);
                         }
                         else
                         {
-                                   save_password_to_disk(NULL);
+                                // Don't leave password from previous session sitting around
+                                // during this login session.
+                                LLStartUp::deletePasswordFromDisk();
                         }
-                        gSavedSettings.setBOOL("RememberPassword", remember_password);
 
-                        // This fixes Imprudence 1.2 thinking it's a teen. 
-                        // Will need fixing for the 1.23 merge.
                         // this is their actual ability to access content
                         text = LLUserAuth::getInstance()->getResponse("agent_access_max");
                         if (!text.empty())
                         {
                                 // agent_access can be 'A', 'M', and 'PG'.
-                                gAgent.convertTextToMaturity(text[0]);
+                                gAgent.setMaturity(text[0]);
                         }
                         else // we're on an older sim version (prolly an opensim)
                         {
@@ -1445,6 +1450,26 @@ bool idle_startup()
                                         gAgent.setTeen(true);
                                 }
                         }
+                        
+                        // this is the value of their preference setting for that content
+                        // which will always be <= agent_access_max
+                        text = LLUserAuth::getInstance()->getResponse("agent_region_access");
+                        if (!text.empty())
+                        {
+                                int preferredMaturity = LLAgent::convertTextToMaturity(text[0]);
+                                gSavedSettings.setU32("PreferredMaturity", preferredMaturity);
+                        }
+                        // During the AO transition, this flag will be true. Then the flag will
+                        // go away. After the AO transition, this code and all the code that
+                        // uses it can be deleted.
+                        text = LLUserAuth::getInstance()->getResponse("ao_transition");
+                        if (!text.empty())
+                        {
+                                if (text == "1")
+                                {
+                                        gAgent.setAOTransition();
+                                }
+                        }
 
                         text = LLUserAuth::getInstance()->getResponse("start_location");
                         if(!text.empty()) agent_start_location.assign(text);
@@ -1652,9 +1677,9 @@ bool idle_startup()
                                         exit(0);
                                 }
                                 // Bounce back to the login screen.
-                                LLStringUtil::format_map_t args;
-                                args["[ERROR_MESSAGE]"] = emsg.str();
-                                gViewerWindow->alertXml("ErrorMessage", args, login_alert_done);
+                                LLSD args;
+                                args["ERROR_MESSAGE"] = emsg.str();
+                                LLNotifications::instance().add("ErrorMessage", args, LLSD(), login_alert_done);
                                 LLStartUp::resetLogin();
                                 gSavedSettings.setBOOL("AutoLogin", FALSE);
                                 //this might be redundant
@@ -1665,7 +1690,7 @@ bool idle_startup()
                         // Pass the user information to the voice chat server interface.
                         gVoiceClient->userAuthorized(firstname, lastname, gAgentID);
                 }
-                else
+                else // if(successful_login)
                 {
                         if (gNoRender)
                         {
@@ -1674,16 +1699,14 @@ bool idle_startup()
                                 exit(0);
                         }
                         // Bounce back to the login screen.
-                        LLStringUtil::format_map_t args;
-                        args["[ERROR_MESSAGE]"] = emsg.str();
-                        gViewerWindow->alertXml("ErrorMessage", args, login_alert_done);
+                        LLSD args;
+                        args["ERROR_MESSAGE"] = emsg.str();
+                        LLNotifications::instance().add("ErrorMessage", args, LLSD(), login_alert_done);
                         LLStartUp::resetLogin();
                         gSavedSettings.setBOOL("AutoLogin", FALSE);
                         //this might be redundant
                         LLStartUp::setShouldAutoLogin(false);
                         show_connect_box = true;
-                        // Don't save an incorrect password to disk.
-                        save_password_to_disk(NULL);
                 }
                 return FALSE;
         }
@@ -1831,7 +1854,10 @@ bool idle_startup()
                         LLError::logToFixedBuffer(gDebugView->mDebugConsolep);
                         // set initial visibility of debug console
                         gDebugView->mDebugConsolep->setVisible(gSavedSettings.getBOOL("ShowDebugConsole"));
-                        gDebugView->mFloaterStatsp->setVisible(gSavedSettings.getBOOL("ShowDebugStats"));
+                        if (gSavedSettings.getBOOL("ShowDebugStats"))
+                        {
+                                LLFloaterStats::showInstance();
+                        }
                 }
 
                 //
@@ -1898,6 +1924,7 @@ bool idle_startup()
                 }
 
                 // Make sure agent knows correct aspect ratio
+                // FOV limits depend upon aspect ratio so this needs to happen before initializing the FOV below
                 LLViewerCamera::getInstance()->setViewHeightInPixels(gViewerWindow->getWindowDisplayHeight());
                 if (gViewerWindow->mWindow->getFullscreen())
                 {
@@ -1907,6 +1934,8 @@ bool idle_startup()
                 {
                         LLViewerCamera::getInstance()->setAspect( (F32) gViewerWindow->getWindowWidth() / (F32) gViewerWindow->getWindowHeight());
                 }
+                // Initialize FOV
+                LLViewerCamera::getInstance()->setDefaultFOV(gSavedSettings.getF32("CameraAngle")); 
 
                 // Move agent to starting location. The position handed to us by
                 // the space server is in global coordinates, but the agent frame
@@ -1923,7 +1952,13 @@ bool idle_startup()
                 {
                         LL_DEBUGS("AppInit") << "Initializing sky..." << LL_ENDL;
                         // Initialize all of the viewer object classes for the first time (doing things like texture fetches.
+                        LLGLState::checkStates();
+                        LLGLState::checkTextureChannels();
+
                         gSky.init(initial_sun_direction);
+
+                        LLGLState::checkStates();
+                        LLGLState::checkTextureChannels();
                 }
 
                 LL_DEBUGS("AppInit") << "Decoding images..." << LL_ENDL;
@@ -2231,13 +2266,7 @@ bool idle_startup()
 
                 // Get L$ and ownership credit information
                 llinfos << "Requesting Money Balance" << llendl;
-                msg->newMessageFast(_PREHASH_MoneyBalanceRequest);
-                msg->nextBlockFast(_PREHASH_AgentData);
-                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                msg->nextBlockFast(_PREHASH_MoneyData);
-                msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null );
-                gAgent.sendReliableMessage();
+                LLStatusBar::sendMoneyBalanceRequest();
 
                 // request all group information
                 llinfos << "Requesting Agent Data" << llendl;
@@ -2410,23 +2439,23 @@ bool idle_startup()
                                 // location is not your expected location. So, if this is
                                 // your first login, then you do not have an expectation,
                                 // thus, do not show this alert.
-                                LLStringUtil::format_map_t args;
+                                LLSD args;
                                 if (url_ok)
                                 {
-                                        args["[TYPE]"] = "desired";
-                                        args["[HELP]"] = "";
+                                        args["TYPE"] = "desired";
+                                        args["HELP"] = "";
                                 }
                                 else if (gSavedSettings.getBOOL("LoginLastLocation"))
                                 {
-                                        args["[TYPE]"] = "last";
-                                        args["[HELP]"] = "";
+                                        args["TYPE"] = "last";
+                                        args["HELP"] = "";
                                 }
                                 else
                                 {
-                                        args["[TYPE]"] = "home";
-                                        args["[HELP]"] = "You may want to set a new home location.";
+                                        args["TYPE"] = "home";
+                                        args["HELP"] = "You may want to set a new home location.";
                                 }
-                                gViewerWindow->alertXml("AvatarMoved", args);
+                                LLNotifications::instance().add("AvatarMoved", args);
                         }
                         else
                         {
@@ -2483,8 +2512,14 @@ bool idle_startup()
                 {
                         update_texture_fetch();
                         set_startup_status(0.60f + 0.30f * timeout_frac,
-                                "Loading world...",
+                                LLTrans::getString("LoginPrecaching"),
                                         gAgent.mMOTD);
+                        display_startup();
+                        if (!LLViewerShaderMgr::sInitialized)
+                        {
+                                LLViewerShaderMgr::sInitialized = TRUE;
+                                LLViewerShaderMgr::instance()->setShaders();
+                        }
                 }
 
                 return TRUE;
@@ -2506,16 +2541,15 @@ bool idle_startup()
                         // initial outfit, but if the load hasn't started
                         // already then something is wrong so fall back
                         // to generic outfits. JC
-                        gViewerWindow->alertXml("WelcomeChooseSex",
-                                callback_choose_gender, NULL);
+                        LLNotifications::instance().add("WelcomeChooseSex", LLSD(), LLSD(),
+                                callback_choose_gender);
                         LLStartUp::setStartupState( STATE_CLEANUP );
                         return TRUE;
                 }
                 
                 if (wearables_time > MAX_WEARABLES_TIME)
                 {
-                        // It's taken too long to load, show the world
-                        gViewerWindow->alertXml("ClothingLoading");
+                        LLNotifications::instance().add("ClothingLoading");
                         LLViewerStats::getInstance()->incStat(LLViewerStats::ST_WEARABLES_TOO_LONG);
                         LLStartUp::setStartupState( STATE_CLEANUP );
                         return TRUE;
@@ -2535,7 +2569,7 @@ bool idle_startup()
                 else
                 {
                         // OK to just get the wearables
-                        if ( gAgent.getWearablesLoaded() )
+                        if ( gAgent.areWearablesLoaded() )
                         {
                                 // We have our clothing, proceed.
                                 //llinfos << "wearables loaded" << llendl;
@@ -2595,6 +2629,11 @@ bool idle_startup()
                 // If we've got a startup URL, dispatch it
                 LLStartUp::dispatchURL();
 
+                // Retrieve information about the land data
+                // (just accessing this the first time will fetch it,
+                // then the data is cached for the viewer's lifetime)
+                LLProductInfoRequestManager::instance();
+                
                 // Clean up the userauth stuff.
                 LLUserAuth::getInstance()->reset();
 
@@ -2616,36 +2655,6 @@ bool idle_startup()
                 gDebugView->mFastTimerView->setVisible(TRUE);
 #endif
 
-                // HACK: remove this when based on 1.23
-                // Send our preferred maturity.
-                // Update agent access preference on the server
-                std::string url = gAgent.getRegion()->getCapability("UpdateAgentInformation");
-                if (!url.empty())
-                {
-                        U32 preferredMaturity = gSavedSettings.getU32("PreferredMaturity");
-                        // Set new access preference
-                        LLSD access_prefs = LLSD::emptyMap();
-                        if (preferredMaturity == SIM_ACCESS_PG)
-                        {
-                                access_prefs["max"] = "PG";
-                        }
-                        else if (preferredMaturity == SIM_ACCESS_MATURE)
-                        {
-                                access_prefs["max"] = "M";
-                        }
-                        if (preferredMaturity == SIM_ACCESS_ADULT)
-                        {
-                                access_prefs["max"] = "A";
-                        }
-                        
-                        LLSD body = LLSD::emptyMap();
-                        body["access_prefs"] = access_prefs;
-                        llinfos << "Sending access prefs update to " << (access_prefs["max"].asString()) << " via capability to: "
-                        << url << llendl;
-                        LLHTTPClient::post(url, body, new LLHTTPClient::Responder());    // Ignore response
-                }
-
-                LLAppViewer::instance()->initMainloopTimeout("Mainloop Init");
 
 // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
                 // RELEASE-RLVa: this should go in LLAppViewer::handleLoginComplete() but Imprudence doesn't call that function
@@ -2718,16 +2727,11 @@ void login_callback(S32 option, void *userdata)
         {
                 // Make sure we don't save the password if the user is trying to clear it.
                 std::string first, last, password;
-                BOOL remember = TRUE;
-                LLPanelLogin::getFields(first, last, password, remember);
-                if (!remember)
+                LLPanelLogin::getFields(&first, &last, &password);
+                if (!gSavedSettings.getBOOL("RememberPassword"))
                 {
                         // turn off the setting and write out to disk
-                        gSavedSettings.setBOOL("RememberPassword", FALSE);
                         gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
-
-                        // stomp the saved password on disk
-                        save_password_to_disk(NULL);
                 }
 
                 // Next iteration through main loop should shut down the app cleanly.
@@ -2745,8 +2749,18 @@ void login_callback(S32 option, void *userdata)
         }
 }
 
-std::string load_password_from_disk()
+
+// static
+std::string LLStartUp::loadPasswordFromDisk()
 {
+        // Only load password if we also intend to save it (otherwise the user
+        // wonders what we're doing behind his back).  JC
+        BOOL remember_password = gSavedSettings.getBOOL("RememberPassword");
+        if (!remember_password)
+        {
+                return std::string("");
+        }
+
         std::string hashed_password("");
 
         // Look for legacy "marker" password from settings.ini
@@ -2798,41 +2812,45 @@ std::string load_password_from_disk()
         return hashed_password;
 }
 
-void save_password_to_disk(const char* hashed_password)
+
+// static
+void LLStartUp::savePasswordToDisk(const std::string& hashed_password)
 {
         std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
                                                                                                            "password.dat");
-        if (!hashed_password)
+        LLFILE* fp = LLFile::fopen(filepath, "wb");             /* Flawfinder: ignore */
+        if (!fp)
         {
-                // No password, remove the file.
-                LLFile::remove(filepath);
+                return;
         }
-        else
-        {
-                LLFILE* fp = LLFile::fopen(filepath, "wb");             /* Flawfinder: ignore */
-                if (!fp)
-                {
-                        return;
-                }
-
-                // Encipher with MAC address
-                const S32 HASHED_LENGTH = 32;
-                U8 buffer[HASHED_LENGTH+1];
 
-                LLStringUtil::copy((char*)buffer, hashed_password, HASHED_LENGTH+1);
+        // Encipher with MAC address
+        const S32 HASHED_LENGTH = 32;
+        U8 buffer[HASHED_LENGTH+1];
 
-                LLXORCipher cipher(gMACAddress, 6);
-                cipher.encrypt(buffer, HASHED_LENGTH);
+        LLStringUtil::copy((char*)buffer, hashed_password.c_str(), HASHED_LENGTH+1);
 
-                if (fwrite(buffer, HASHED_LENGTH, 1, fp) != 1)
-                {
-                        LL_WARNS("AppInit") << "Short write" << LL_ENDL;
-                }
+        LLXORCipher cipher(gMACAddress, 6);
+        cipher.encrypt(buffer, HASHED_LENGTH);
 
-                fclose(fp);
+        if (fwrite(buffer, HASHED_LENGTH, 1, fp) != 1)
+        {
+                LL_WARNS("AppInit") << "Short write" << LL_ENDL;
         }
+
+        fclose(fp);
 }
 
+
+// static
+void LLStartUp::deletePasswordFromDisk()
+{
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
+                                                                                                                  "password.dat");
+        LLFile::remove(filepath);
+}
+
+
 bool is_hex_string(U8* str, S32 len)
 {
         bool rv = true;
@@ -2869,11 +2887,12 @@ bool is_hex_string(U8* str, S32 len)
 
 void show_first_run_dialog()
 {
-        gViewerWindow->alertXml("FirstRun", first_run_dialog_callback, NULL);
+        LLNotifications::instance().add("FirstRun", LLSD(), LLSD(), first_run_dialog_callback);
 }
 
-void first_run_dialog_callback(S32 option, void* userdata)
+bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
         if (0 == option)
         {
                 LL_DEBUGS("AppInit") << "First run dialog cancelling" << LL_ENDL;
@@ -2881,6 +2900,7 @@ void first_run_dialog_callback(S32 option, void* userdata)
         }
 
         LLPanelLogin::giveFocus();
+        return false;
 }
 
 
@@ -2893,8 +2913,9 @@ void set_startup_status(const F32 frac, const std::string& string, const std::st
         gViewerWindow->setProgressMessage(msg);
 }
 
-void login_alert_status(S32 option, void* user_data)
+bool login_alert_status(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
     // Buttons
     switch( option )
     {
@@ -2913,6 +2934,7 @@ void login_alert_status(S32 option, void* user_data)
     }
 
         LLPanelLogin::giveFocus();
+        return false;
 }
 
 void update_app(BOOL mandatory, const std::string& auth_msg)
@@ -2928,68 +2950,66 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
         {
                 msg = "(" + auth_msg + ") \n";
         }
-        LLStringUtil::format_map_t args;
-        args["[MESSAGE]"] = msg;
+
+        LLSD args;
+        args["MESSAGE"] = msg;
         
-        // represent a bool as a null/non-null pointer
-        void *mandatoryp = mandatory ? &mandatory : NULL;
+        LLSD payload;
+        payload["mandatory"] = mandatory;
 
+/*
+ We're constructing one of the following 6 strings here:
+         "DownloadWindowsMandatory"
+         "DownloadWindowsReleaseForDownload"
+         "DownloadWindows"
+         "DownloadMacMandatory"
+         "DownloadMacReleaseForDownload"
+         "DownloadMac"
+ 
+ I've called them out explicitly in this comment so that they can be grepped for.
+ 
+ Also, we assume that if we're not Windows we're Mac. If we ever intend to support 
+ Linux with autoupdate, this should be an explicit #elif LL_DARWIN, but 
+ we'd rather deliver the wrong message than no message, so until Linux is supported
+ we'll leave it alone.
+ */
+        std::string notification_name = "Download";
+        
 #if LL_WINDOWS
-        if (mandatory)
-        {
-                gViewerWindow->alertXml("DownloadWindowsMandatory", args,
-                                                                update_dialog_callback,
-                                                                mandatoryp);
-        }
-        else
-        {
-#if LL_RELEASE_FOR_DOWNLOAD
-                gViewerWindow->alertXml("DownloadWindowsReleaseForDownload", args,
-                                                                update_dialog_callback,
-                                                                mandatoryp);
+        notification_name += "Windows";
 #else
-                gViewerWindow->alertXml("DownloadWindows", args,
-                                                                update_dialog_callback,
-                                                                mandatoryp);
+        notification_name += "Mac";
 #endif
-        }
-#else
+        
         if (mandatory)
         {
-                gViewerWindow->alertXml("DownloadMacMandatory", args,
-                                                                update_dialog_callback,
-                                                                mandatoryp);
+                notification_name += "Mandatory";
         }
         else
         {
 #if LL_RELEASE_FOR_DOWNLOAD
-                gViewerWindow->alertXml("DownloadMacReleaseForDownload", args,
-                                                                update_dialog_callback,
-                                                                mandatoryp);
-#else
-                gViewerWindow->alertXml("DownloadMac", args,
-                                                                update_dialog_callback,
-                                                                mandatoryp);
+                notification_name += "ReleaseForDownload";
 #endif
         }
-#endif
-
+        
+        LLNotifications::instance().add(notification_name, args, payload, update_dialog_callback);
+        
 }
 
-
-void update_dialog_callback(S32 option, void *userdata)
+bool update_dialog_callback(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
         std::string update_exe_path;
-        bool mandatory = userdata != NULL;
+        bool mandatory = notification["payload"]["mandatory"].asBoolean();
 
 #if !LL_RELEASE_FOR_DOWNLOAD
         if (option == 2)
         {
                 LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT ); 
-                return;
+                return false;
         }
 #endif
-        
+
         if (option == 1)
         {
                 // ...user doesn't want to do it
@@ -3001,7 +3021,7 @@ void update_dialog_callback(S32 option, void *userdata)
                 {
                         LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
                 }
-                return;
+                return false;
         }
         
         LLSD query_map = LLSD::emptyMap();
@@ -3012,12 +3032,15 @@ void update_dialog_callback(S32 option, void *userdata)
         query_map["os"] = "mac";
 #elif LL_LINUX
         query_map["os"] = "lnx";
+#elif LL_SOLARIS
+        query_map["os"] = "sol";
 #endif
         // *TODO change userserver to be grid on both viewer and sim, since
         // userserver no longer exists.
         query_map["userserver"] = LLViewerLogin::getInstance()->getGridLabel();
         query_map["channel"] = gSavedSettings.getString("VersionChannelName");
         // *TODO constantize this guy
+        // *NOTE: This URL is also used in win_setup/lldownloader.cpp
         LLURI update_url = LLURI::buildHTTP("secondlife.com", 80, "update.php", query_map);
         
 /*      if(LLAppViewer::sUpdaterInfo)
@@ -3036,7 +3059,7 @@ void update_dialog_callback(S32 option, void *userdata)
                 // We're hosed, bail
                 LL_WARNS("AppInit") << "LLDir::getTempFilename() failed" << LL_ENDL;
                 LLAppViewer::instance()->forceQuit();
-                return;
+                return false;
         }
 
         LLAppViewer::sUpdaterInfo->mUpdateExePath += ".exe";
@@ -3057,7 +3080,7 @@ void update_dialog_callback(S32 option, void *userdata)
 
                 LL_WARNS("AppInit") << "Unable to copy the updater!" << LL_ENDL;
                 LLAppViewer::instance()->forceQuit();
-                return;
+                return false;
         }
 
         // if a sim name was passed in via command line parameter (typically through a SLURL)
@@ -3096,13 +3119,14 @@ void update_dialog_callback(S32 option, void *userdata)
 */
         //system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */
 /*
-#elif LL_LINUX
+#elif LL_LINUX || LL_SOLARIS
         OSMessageBox("Automatic updating is not yet implemented for Linux.\n"
                 "Please download the latest version from www.secondlife.com.",
                 LLStringUtil::null, OSMB_OK);
 #endif
         LLAppViewer::instance()->forceQuit();
         */
+        return false;
 }
 
 void use_circuit_callback(void**, S32 result)
@@ -3116,8 +3140,7 @@ void use_circuit_callback(void**, S32 result)
                 {
                         // Make sure user knows something bad happened. JC
                         LL_WARNS("AppInit") << "Backing up to login screen!" << LL_ENDL;
-                        gViewerWindow->alertXml("LoginPacketNeverReceived",
-                                login_alert_status, NULL);
+                        LLNotifications::instance().add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status);
                         LLStartUp::resetLogin();
                 }
                 else
@@ -3320,570 +3343,6 @@ void init_stat_view()
         LLFrameStatView *frameviewp = gDebugView->mFrameStatView;
         frameviewp->setup(gFrameStats);
         frameviewp->mShowPercent = FALSE;
-
-        LLRect rect;
-        LLStatBar *stat_barp;
-        rect = gDebugView->mFloaterStatsp->getRect();
-
-        //
-        // Viewer advanced stats
-        //
-        LLStatView *stat_viewp = NULL;
-
-        //
-        // Viewer Basic
-        //
-        stat_viewp = new LLStatView("basic stat view", "Basic", "OpenDebugStatBasic", rect);
-        gDebugView->mFloaterStatsp->addStatView(stat_viewp);
-
-        stat_barp = stat_viewp->addStat("FPS", &(LLViewerStats::getInstance()->mFPSStat));
-        stat_barp->setUnitLabel(" fps");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 45.f;
-        stat_barp->mTickSpacing = 7.5f;
-        stat_barp->mLabelSpacing = 15.f;
-        stat_barp->mPrecision = 1;
-        stat_barp->mDisplayBar = TRUE;
-        stat_barp->mDisplayHistory = TRUE;
-
-        stat_barp = stat_viewp->addStat("Bandwidth", &(LLViewerStats::getInstance()->mKBitStat));
-        stat_barp->setUnitLabel(" kbps");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 900.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 300.f;
-        stat_barp->mDisplayBar = TRUE;
-        stat_barp->mDisplayHistory = FALSE;
-
-        stat_barp = stat_viewp->addStat("Packet Loss", &(LLViewerStats::getInstance()->mPacketsLostPercentStat));
-        stat_barp->setUnitLabel(" %");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 5.f;
-        stat_barp->mTickSpacing = 1.f;
-        stat_barp->mLabelSpacing = 1.f;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayMean = TRUE;
-        stat_barp->mPrecision = 1;
-
-        stat_barp = stat_viewp->addStat("Ping Sim", &(LLViewerStats::getInstance()->mSimPingStat));
-        stat_barp->setUnitLabel(" msec");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 1000.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 200.f;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-
-        stat_viewp = new LLStatView("advanced stat view", "Advanced", "OpenDebugStatAdvanced", rect);
-        gDebugView->mFloaterStatsp->addStatView(stat_viewp);
-
-
-        LLStatView *render_statviewp;
-        render_statviewp = new LLStatView("render stat view", "Render", "OpenDebugStatRender", rect);
-        stat_viewp->addChildAtEnd(render_statviewp);
-
-        stat_barp = render_statviewp->addStat("KTris Drawn", &(gPipeline.mTrianglesDrawnStat));
-        stat_barp->setUnitLabel("/fr");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 500.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 500.f;
-        stat_barp->mPrecision = 1;
-        stat_barp->mPerSec = FALSE;
-
-        stat_barp = render_statviewp->addStat("KTris Drawn", &(gPipeline.mTrianglesDrawnStat));
-        stat_barp->setUnitLabel("/sec");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 3000.f;
-        stat_barp->mTickSpacing = 250.f;
-        stat_barp->mLabelSpacing = 1000.f;
-        stat_barp->mPrecision = 1;
-
-        stat_barp = render_statviewp->addStat("Total Objs", &(gObjectList.mNumObjectsStat));
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 10000.f;
-        stat_barp->mTickSpacing = 2500.f;
-        stat_barp->mLabelSpacing = 5000.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-
-        stat_barp = render_statviewp->addStat("New Objs", &(gObjectList.mNumNewObjectsStat));
-        stat_barp->setLabel("New Objs");
-        stat_barp->setUnitLabel("/sec");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 1000.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 500.f;
-        stat_barp->mPerSec = TRUE;
-        stat_barp->mDisplayBar = FALSE;
-
-
-        // Texture statistics
-        LLStatView *texture_statviewp;
-        texture_statviewp = new LLStatView("texture stat view", "Texture", "", rect);
-        render_statviewp->addChildAtEnd(texture_statviewp);
-
-        stat_barp = texture_statviewp->addStat("Count", &(gImageList.sNumImagesStat));
-        stat_barp->setUnitLabel("");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 8000.f;
-        stat_barp->mTickSpacing = 2000.f;
-        stat_barp->mLabelSpacing = 4000.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-
-        stat_barp = texture_statviewp->addStat("Raw Count", &(gImageList.sNumRawImagesStat));
-        stat_barp->setUnitLabel("");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 8000.f;
-        stat_barp->mTickSpacing = 2000.f;
-        stat_barp->mLabelSpacing = 4000.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-
-        stat_barp = texture_statviewp->addStat("GL Mem", &(gImageList.sGLTexMemStat));
-        stat_barp->setUnitLabel("");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 400.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 200.f;
-        stat_barp->mPrecision = 1;
-        stat_barp->mPerSec = FALSE;
-
-        stat_barp = texture_statviewp->addStat("Formatted Mem", &(gImageList.sFormattedMemStat));
-        stat_barp->setUnitLabel("");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 400.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 200.f;
-        stat_barp->mPrecision = 1;
-        stat_barp->mPerSec = FALSE;
-
-        stat_barp = texture_statviewp->addStat("Raw Mem", &(gImageList.sRawMemStat));
-        stat_barp->setUnitLabel("");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 400.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 200.f;
-        stat_barp->mPrecision = 1;
-        stat_barp->mPerSec = FALSE;
-
-        stat_barp = texture_statviewp->addStat("Bound Mem", &(gImageList.sGLBoundMemStat));
-        stat_barp->setUnitLabel("");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 400.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 200.f;
-        stat_barp->mPrecision = 1;
-        stat_barp->mPerSec = FALSE;
-
-        
-        // Network statistics
-        LLStatView *net_statviewp;
-        net_statviewp = new LLStatView("network stat view", "Network", "OpenDebugStatNet", rect);
-        stat_viewp->addChildAtEnd(net_statviewp);
-
-        stat_barp = net_statviewp->addStat("Packets In", &(LLViewerStats::getInstance()->mPacketsInStat));
-        stat_barp->setUnitLabel("/sec");
-        stat_barp->mDisplayBar = FALSE;
-
-        stat_barp = net_statviewp->addStat("Packets Out", &(LLViewerStats::getInstance()->mPacketsOutStat));
-        stat_barp->setUnitLabel("/sec");
-        stat_barp->mDisplayBar = FALSE;
-
-        stat_barp = net_statviewp->addStat("Objects", &(LLViewerStats::getInstance()->mObjectKBitStat));
-        stat_barp->setUnitLabel(" kbps");
-        stat_barp->mDisplayBar = FALSE;
-
-        stat_barp = net_statviewp->addStat("Texture", &(LLViewerStats::getInstance()->mTextureKBitStat));
-        stat_barp->setUnitLabel(" kbps");
-        stat_barp->mDisplayBar = FALSE;
-
-        stat_barp = net_statviewp->addStat("Asset", &(LLViewerStats::getInstance()->mAssetKBitStat));
-        stat_barp->setUnitLabel(" kbps");
-        stat_barp->mDisplayBar = FALSE;
-
-        stat_barp = net_statviewp->addStat("Layers", &(LLViewerStats::getInstance()->mLayersKBitStat));
-        stat_barp->setUnitLabel(" kbps");
-        stat_barp->mDisplayBar = FALSE;
-
-        stat_barp = net_statviewp->addStat("Actual In", &(LLViewerStats::getInstance()->mActualInKBitStat));
-        stat_barp->setUnitLabel(" kbps");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 1024.f;
-        stat_barp->mTickSpacing = 128.f;
-        stat_barp->mLabelSpacing = 256.f;
-        stat_barp->mDisplayBar = TRUE;
-        stat_barp->mDisplayHistory = FALSE;
-
-        stat_barp = net_statviewp->addStat("Actual Out", &(LLViewerStats::getInstance()->mActualOutKBitStat));
-        stat_barp->setUnitLabel(" kbps");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 512.f;
-        stat_barp->mTickSpacing = 128.f;
-        stat_barp->mLabelSpacing = 256.f;
-        stat_barp->mDisplayBar = TRUE;
-        stat_barp->mDisplayHistory = FALSE;
-
-        stat_barp = net_statviewp->addStat("VFS Pending Ops", &(LLViewerStats::getInstance()->mVFSPendingOperations));
-        stat_barp->setUnitLabel(" ");
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-
-
-        // Simulator stats
-        LLStatView *sim_statviewp = new LLStatView("sim stat view", "Simulator", "OpenDebugStatSim", rect);
-        gDebugView->mFloaterStatsp->addStatView(sim_statviewp);
-
-        stat_barp = sim_statviewp->addStat("Time Dilation", &(LLViewerStats::getInstance()->mSimTimeDilation));
-        stat_barp->mPrecision = 2;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 1.f;
-        stat_barp->mTickSpacing = 0.25f;
-        stat_barp->mLabelSpacing = 0.5f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Sim FPS", &(LLViewerStats::getInstance()->mSimFPS));
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 200.f;
-        stat_barp->mTickSpacing = 20.f;
-        stat_barp->mLabelSpacing = 100.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Physics FPS", &(LLViewerStats::getInstance()->mSimPhysicsFPS));
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 66.f;
-        stat_barp->mTickSpacing = 33.f;
-        stat_barp->mLabelSpacing = 33.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        LLStatView *phys_details_viewp;
-        phys_details_viewp = new LLStatView("phys detail view", "Physics Details", "", rect);
-        sim_statviewp->addChildAtEnd(phys_details_viewp);
-
-        stat_barp = phys_details_viewp->addStat("Pinned Objects", &(LLViewerStats::getInstance()->mPhysicsPinnedTasks));
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 500.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 40.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = phys_details_viewp->addStat("Low LOD Objects", &(LLViewerStats::getInstance()->mPhysicsLODTasks));
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 500.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 40.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = phys_details_viewp->addStat("Memory Allocated", &(LLViewerStats::getInstance()->mPhysicsMemoryAllocated));
-        stat_barp->setUnitLabel(" MB");
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 1024.f;
-        stat_barp->mTickSpacing = 128.f;
-        stat_barp->mLabelSpacing = 256.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Agent Updates/Sec", &(LLViewerStats::getInstance()->mSimAgentUPS));
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 100.f;
-        stat_barp->mTickSpacing = 25.f;
-        stat_barp->mLabelSpacing = 50.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Main Agents", &(LLViewerStats::getInstance()->mSimMainAgents));
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 80.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 40.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Child Agents", &(LLViewerStats::getInstance()->mSimChildAgents));
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 40.f;
-        stat_barp->mTickSpacing = 5.f;
-        stat_barp->mLabelSpacing = 10.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Objects", &(LLViewerStats::getInstance()->mSimObjects));
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 30000.f;
-        stat_barp->mTickSpacing = 5000.f;
-        stat_barp->mLabelSpacing = 10000.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Active Objects", &(LLViewerStats::getInstance()->mSimActiveObjects));
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 800.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 200.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Active Scripts", &(LLViewerStats::getInstance()->mSimActiveScripts));
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 800.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 200.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Script Events", &(LLViewerStats::getInstance()->mSimScriptEPS));
-        stat_barp->setUnitLabel(" eps");
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 20000.f;
-        stat_barp->mTickSpacing = 2500.f;
-        stat_barp->mLabelSpacing = 5000.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Packets In", &(LLViewerStats::getInstance()->mSimInPPS));
-        stat_barp->setUnitLabel(" pps");
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 2000.f;
-        stat_barp->mTickSpacing = 250.f;
-        stat_barp->mLabelSpacing = 1000.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Packets Out", &(LLViewerStats::getInstance()->mSimOutPPS));
-        stat_barp->setUnitLabel(" pps");
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 2000.f;
-        stat_barp->mTickSpacing = 250.f;
-        stat_barp->mLabelSpacing = 1000.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Pending Downloads", &(LLViewerStats::getInstance()->mSimPendingDownloads));
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 800.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 200.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Pending Uploads", &(LLViewerStats::getInstance()->mSimPendingUploads));
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 100.f;
-        stat_barp->mTickSpacing = 25.f;
-        stat_barp->mLabelSpacing = 50.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_statviewp->addStat("Total Unacked Bytes", &(LLViewerStats::getInstance()->mSimTotalUnackedBytes));
-        stat_barp->setUnitLabel(" kb");
-        stat_barp->mPrecision = 0;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 100000.f;
-        stat_barp->mTickSpacing = 25000.f;
-        stat_barp->mLabelSpacing = 50000.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        LLStatView *sim_time_viewp;
-        sim_time_viewp = new LLStatView("sim perf view", "Time (ms)", "", rect);
-        sim_statviewp->addChildAtEnd(sim_time_viewp);
-
-        stat_barp = sim_time_viewp->addStat("Total Frame Time", &(LLViewerStats::getInstance()->mSimFrameMsec));
-        stat_barp->setUnitLabel("ms");
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 40.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 20.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_time_viewp->addStat("Net Time", &(LLViewerStats::getInstance()->mSimNetMsec));
-        stat_barp->setUnitLabel("ms");
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 40.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 20.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_time_viewp->addStat("Physics Time", &(LLViewerStats::getInstance()->mSimSimPhysicsMsec));
-        stat_barp->setUnitLabel("ms");
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 40.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 20.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_time_viewp->addStat("Simulation Time", &(LLViewerStats::getInstance()->mSimSimOtherMsec));
-        stat_barp->setUnitLabel("ms");
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 40.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 20.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_time_viewp->addStat("Agent Time", &(LLViewerStats::getInstance()->mSimAgentMsec));
-        stat_barp->setUnitLabel("ms");
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 40.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 20.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_time_viewp->addStat("Images Time", &(LLViewerStats::getInstance()->mSimImagesMsec));
-        stat_barp->setUnitLabel("ms");
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 40.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 20.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_time_viewp->addStat("Script Time", &(LLViewerStats::getInstance()->mSimScriptMsec));
-        stat_barp->setUnitLabel("ms");
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 40.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 20.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        stat_barp = sim_time_viewp->addStat("Spare Time", &(LLViewerStats::getInstance()->mSimSpareMsec));
-        stat_barp->setUnitLabel("ms");
-        stat_barp->mPrecision = 1;
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 40.f;
-        stat_barp->mTickSpacing = 10.f;
-        stat_barp->mLabelSpacing = 20.f;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mDisplayMean = FALSE;
-
-        
-        // 2nd level time blocks under 'Details' second
-        LLStatView *detailed_time_viewp;
-        detailed_time_viewp = new LLStatView("sim perf view", "Time Details (ms)", "", rect);
-        sim_time_viewp->addChildAtEnd(detailed_time_viewp);
-        {
-                stat_barp = detailed_time_viewp->addStat("  Physics Step", &(LLViewerStats::getInstance()->mSimSimPhysicsStepMsec));
-                stat_barp->setUnitLabel("ms");
-                stat_barp->mPrecision = 1;
-                stat_barp->mMinBar = 0.f;
-                stat_barp->mMaxBar = 40.f;
-                stat_barp->mTickSpacing = 10.f;
-                stat_barp->mLabelSpacing = 20.f;
-                stat_barp->mPerSec = FALSE;
-                stat_barp->mDisplayBar = FALSE;
-                stat_barp->mDisplayMean = FALSE;
-
-                stat_barp = detailed_time_viewp->addStat("  Update Physics Shapes", &(LLViewerStats::getInstance()->mSimSimPhysicsShapeUpdateMsec));
-                stat_barp->setUnitLabel("ms");
-                stat_barp->mPrecision = 1;
-                stat_barp->mMinBar = 0.f;
-                stat_barp->mMaxBar = 40.f;
-                stat_barp->mTickSpacing = 10.f;
-                stat_barp->mLabelSpacing = 20.f;
-                stat_barp->mPerSec = FALSE;
-                stat_barp->mDisplayBar = FALSE;
-                stat_barp->mDisplayMean = FALSE;
-
-                stat_barp = detailed_time_viewp->addStat("  Physics Other", &(LLViewerStats::getInstance()->mSimSimPhysicsOtherMsec));
-                stat_barp->setUnitLabel("ms");
-                stat_barp->mPrecision = 1;
-                stat_barp->mMinBar = 0.f;
-                stat_barp->mMaxBar = 40.f;
-                stat_barp->mTickSpacing = 10.f;
-                stat_barp->mLabelSpacing = 20.f;
-                stat_barp->mPerSec = FALSE;
-                stat_barp->mDisplayBar = FALSE;
-                stat_barp->mDisplayMean = FALSE;
-
-                stat_barp = detailed_time_viewp->addStat("  Sleep Time", &(LLViewerStats::getInstance()->mSimSleepMsec));
-                stat_barp->setUnitLabel("ms");
-                stat_barp->mPrecision = 1;
-                stat_barp->mMinBar = 0.f;
-                stat_barp->mMaxBar = 40.f;
-                stat_barp->mTickSpacing = 10.f;
-                stat_barp->mLabelSpacing = 20.f;
-                stat_barp->mPerSec = FALSE;
-                stat_barp->mDisplayBar = FALSE;
-                stat_barp->mDisplayMean = FALSE;
-
-                stat_barp = detailed_time_viewp->addStat("  Pump IO", &(LLViewerStats::getInstance()->mSimPumpIOMsec));
-                stat_barp->setUnitLabel("ms");
-                stat_barp->mPrecision = 1;
-                stat_barp->mMinBar = 0.f;
-                stat_barp->mMaxBar = 40.f;
-                stat_barp->mTickSpacing = 10.f;
-                stat_barp->mLabelSpacing = 20.f;
-                stat_barp->mPerSec = FALSE;
-                stat_barp->mDisplayBar = FALSE;
-                stat_barp->mDisplayMean = FALSE;
-        }
-
-        LLRect r = gDebugView->mFloaterStatsp->getRect();
-
-        // Reshape based on the parameters we set.
-        gDebugView->mFloaterStatsp->reshape(r.getWidth(), r.getHeight());
 }
 
 void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32)
@@ -3901,8 +3360,9 @@ const S32 OPT_CLOSED_WINDOW = -1;
 const S32 OPT_MALE = 0;
 const S32 OPT_FEMALE = 1;
 
-void callback_choose_gender(S32 option, void* userdata)
-{
+bool callback_choose_gender(const LLSD& notification, const LLSD& response)
+{       
+        S32 option = LLNotification::getSelectedOption(notification, response);
         switch(option)
         {
         case OPT_MALE:
@@ -3915,6 +3375,7 @@ void callback_choose_gender(S32 option, void* userdata)
                 LLStartUp::loadInitialOutfit( FEMALE_OUTFIT_FOLDER, "female" );
                 break;
         }
+        return false;
 }
 
 void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
@@ -3957,8 +3418,8 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
         // This is really misnamed -- it means we have started loading
         // an outfit/shape that will give the avatar a gender eventually. JC
         gAgent.setGenderChosen(TRUE);
+
 }
-                        
 
 // Loads a bitmap to display during load
 // location_id = 0 => last position
@@ -4107,7 +3568,7 @@ void LLStartUp::multimediaInit()
 {
         LL_DEBUGS("AppInit") << "Initializing Multimedia...." << LL_ENDL;
         std::string msg = LLTrans::getString("LoginInitializingMultimedia");
-        set_startup_status(0.50f, msg.c_str(), gAgent.mMOTD.c_str());
+        set_startup_status(0.42f, msg.c_str(), gAgent.mMOTD.c_str());
         display_startup();
 
         LLViewerMedia::initClass();
@@ -4119,8 +3580,9 @@ bool LLStartUp::dispatchURL()
         // ok, if we've gotten this far and have a startup URL
         if (!sSLURLCommand.empty())
         {
-                const bool from_external_browser = true;
-                LLURLDispatcher::dispatch(sSLURLCommand, from_external_browser);
+                LLWebBrowserCtrl* web = NULL;
+                const bool trusted_browser = false;
+                LLURLDispatcher::dispatch(sSLURLCommand, web, trusted_browser);
         }
         else if (LLURLSimString::parse())
         {
@@ -4136,17 +3598,19 @@ bool LLStartUp::dispatchURL()
                         || (dy*dy > SLOP*SLOP) )
                 {
                         std::string url = LLURLSimString::getURL();
-                        const bool from_external_browser = true;
-                        LLURLDispatcher::dispatch(url, from_external_browser);
+                        LLWebBrowserCtrl* web = NULL;
+                        const bool trusted_browser = false;
+                        LLURLDispatcher::dispatch(url, web, trusted_browser);
                 }
                 return true;
         }
         return false;
 }
 
-void login_alert_done(S32 option, void* user_data)
+bool login_alert_done(const LLSD& notification, const LLSD& response)
 {
         LLPanelLogin::giveFocus();
+        return false;
 }