Remove the first login screen (#4451)

* Remove panel_login_first.xml and it's components

* Remove additional first login panel resources

* Remove redundant comment

* Remove *.jpg search from viewer manifest

Author: FelixWolf

indra/newview/llpanellogin.cpp

@@ -184,7 +184,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
     mCallback(callback),
     mCallbackData(cb_data),
     mListener(new LLPanelLoginListener(this)),
-    mFirstLoginThisInstall(gSavedSettings.getBOOL("FirstLoginThisInstall")),
     mUsernameLength(0),
     mPasswordLength(0),
     mLocationLength(0),
@@ -203,14 +202,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         login_holder->addChild(this);
     }
 
-    if (mFirstLoginThisInstall)
-    {
-        buildFromFile( "panel_login_first.xml");
-    }
-    else
-    {
-        buildFromFile( "panel_login.xml");
-    }
+    buildFromFile("panel_login.xml");
 
     reshape(rect.getWidth(), rect.getHeight());
 
@@ -224,38 +216,36 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
     sendChildToBack(getChildView("sign_up_text"));
 
     std::string current_grid = LLGridManager::getInstance()->getGrid();
-    if (!mFirstLoginThisInstall)
-    {
-        LLComboBox* favorites_combo = getChild<LLComboBox>("start_location_combo");
-        updateLocationSelectorsVisibility(); // separate so that it can be called from preferences
-        favorites_combo->setReturnCallback(boost::bind(&LLPanelLogin::onClickConnect, false));
-        favorites_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onLocationSLURL, this));
 
-        LLComboBox* server_choice_combo = getChild<LLComboBox>("server_combo");
-        server_choice_combo->setCommitCallback(boost::bind(&LLPanelLogin::onSelectServer, this));
+    LLComboBox* favorites_combo = getChild<LLComboBox>("start_location_combo");
+    updateLocationSelectorsVisibility(); // separate so that it can be called from preferences
+    favorites_combo->setReturnCallback(boost::bind(&LLPanelLogin::onClickConnect, false));
+    favorites_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onLocationSLURL, this));
+
+    LLComboBox* server_choice_combo = getChild<LLComboBox>("server_combo");
+    server_choice_combo->setCommitCallback(boost::bind(&LLPanelLogin::onSelectServer, this));
 
-        // Load all of the grids, sorted, and then add a bar and the current grid at the top
-        server_choice_combo->removeall();
+    // Load all of the grids, sorted, and then add a bar and the current grid at the top
+    server_choice_combo->removeall();
 
-        std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();
-        for (std::map<std::string, std::string>::iterator grid_choice = known_grids.begin();
-            grid_choice != known_grids.end();
-            grid_choice++)
+    std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();
+    for (std::map<std::string, std::string>::iterator grid_choice = known_grids.begin();
+        grid_choice != known_grids.end();
+        grid_choice++)
+    {
+        if (!grid_choice->first.empty() && current_grid != grid_choice->first)
         {
-            if (!grid_choice->first.empty() && current_grid != grid_choice->first)
-            {
-                LL_DEBUGS("AppInit") << "adding " << grid_choice->first << LL_ENDL;
-                server_choice_combo->add(grid_choice->second, grid_choice->first);
-            }
+            LL_DEBUGS("AppInit") << "adding " << grid_choice->first << LL_ENDL;
+            server_choice_combo->add(grid_choice->second, grid_choice->first);
         }
-        server_choice_combo->sortByName();
-
-        LL_DEBUGS("AppInit") << "adding current " << current_grid << LL_ENDL;
-        server_choice_combo->add(LLGridManager::getInstance()->getGridLabel(),
-            current_grid,
-            ADD_TOP);
-        server_choice_combo->selectFirstItem();
     }
+    server_choice_combo->sortByName();
+
+    LL_DEBUGS("AppInit") << "adding current " << current_grid << LL_ENDL;
+    server_choice_combo->add(LLGridManager::getInstance()->getGridLabel(),
+        current_grid,
+        ADD_TOP);
+    server_choice_combo->selectFirstItem();
 
     LLSLURL start_slurl(LLStartUp::getStartSLURL());
     // The StartSLURL might have been set either by an explicit command-line
@@ -331,15 +321,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 void LLPanelLogin::addFavoritesToStartLocation()
 {
-    if (mFirstLoginThisInstall)
-    {
-        // first login panel has no favorites, just update name length and buttons
-        std::string user_defined_name = getChild<LLComboBox>("username_combo")->getSimple();
-        mUsernameLength = static_cast<unsigned int>(user_defined_name.length());
-        updateLoginButtons();
-        return;
-    }
-
     // Clear the combo.
     LLComboBox* combo = getChild<LLComboBox>("start_location_combo");
     if (!combo) return;
@@ -559,16 +540,9 @@ void LLPanelLogin::resetFields()
         // function is used to reset list in case of changes by external sources
         return;
     }
-    if (sInstance->mFirstLoginThisInstall)
-    {
-        // no list to populate
-        LL_WARNS() << "Shouldn't happen, user should have no ability to modify list on first install" << LL_ENDL;
-    }
-    else
-    {
-        LLPointer<LLCredential> cred = gSecAPIHandler->loadCredential(LLGridManager::getInstance()->getGrid());
-        sInstance->populateUserList(cred);
-    }
+
+    LLPointer<LLCredential> cred = gSecAPIHandler->loadCredential(LLGridManager::getInstance()->getGrid());
+    sInstance->populateUserList(cred);
 }
 
 // static
@@ -586,7 +560,6 @@ void LLPanelLogin::setFields(LLPointer<LLCredential> credential)
 
     if(identifier.has("type") && (std::string)identifier["type"] == "agent")
     {
-        // not nessesary for panel_login.xml, needed for panel_login_first.xml
         std::string firstname = identifier["first_name"].asString();
         std::string lastname = identifier["last_name"].asString();
         std::string login_id = firstname;
@@ -1081,8 +1054,7 @@ void LLPanelLogin::onRememberUserCheck(void*)
         LLComboBox* user_combo(sInstance->getChild<LLComboBox>("username_combo"));
 
         bool remember = remember_name->getValue().asBoolean();
-        if (!sInstance->mFirstLoginThisInstall
-            && user_combo->getCurrentIndex() != -1
+        if (user_combo->getCurrentIndex() != -1
             && !remember)
         {
             remember = true;
@@ -1197,17 +1169,14 @@ void LLPanelLogin::updateLoginButtons()
 
     login_btn->setEnabled(mUsernameLength != 0 && mPasswordLength != 0);
 
-    if (!mFirstLoginThisInstall)
+    LLComboBox* user_combo = getChild<LLComboBox>("username_combo");
+    LLCheckBoxCtrl* remember_name = getChild<LLCheckBoxCtrl>("remember_name");
+    if (user_combo->getCurrentIndex() != -1)
     {
-        LLComboBox* user_combo = getChild<LLComboBox>("username_combo");
-        LLCheckBoxCtrl* remember_name = getChild<LLCheckBoxCtrl>("remember_name");
-        if (user_combo->getCurrentIndex() != -1)
-        {
-            remember_name->setValue(true);
-            LLCheckBoxCtrl* remember_pass = getChild<LLCheckBoxCtrl>("remember_password");
-            remember_pass->setEnabled(true);
-        } // Note: might be good idea to do "else remember_name->setValue(mRememberedState)" but it might behave 'weird' to user
-    }
+        remember_name->setValue(true);
+        LLCheckBoxCtrl* remember_pass = getChild<LLCheckBoxCtrl>("remember_password");
+        remember_pass->setEnabled(true);
+    } // Note: might be good idea to do "else remember_name->setValue(mRememberedState)" but it might behave 'weird' to user
 }
 
 void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential)

indra/newview/llpanellogin.h

@@ -119,7 +119,6 @@ class LLPanelLogin:
 
     static LLPanelLogin* sInstance;
     static bool     sCapslockDidNotification;
-    bool            mFirstLoginThisInstall;
 
     static bool sCredentialSet;