From 1db30ba23b0af0885d0cb6ba41a6d336e775214d Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 25 Mar 2026 18:17:25 +0200 Subject: #5577 Remove first login screen --- indra/newview/llpanellogin.cpp | 56 +---- indra/newview/llpanellogin.h | 1 - .../skins/default/xui/de/panel_login_first.xml | 39 --- .../skins/default/xui/en/panel_login_first.xml | 263 --------------------- .../skins/default/xui/es/panel_login_first.xml | 39 --- .../skins/default/xui/fr/panel_login_first.xml | 39 --- .../skins/default/xui/it/panel_login_first.xml | 39 --- .../skins/default/xui/ja/panel_login_first.xml | 54 ----- .../skins/default/xui/pl/panel_login_first.xml | 30 --- .../skins/default/xui/pt/panel_login_first.xml | 39 --- .../skins/default/xui/ru/panel_login_first.xml | 39 --- .../skins/default/xui/tr/panel_login_first.xml | 39 --- .../skins/default/xui/zh/panel_login_first.xml | 39 --- 13 files changed, 12 insertions(+), 704 deletions(-) delete mode 100644 indra/newview/skins/default/xui/de/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/en/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/es/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/it/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/pl/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/ru/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/tr/panel_login_first.xml delete mode 100644 indra/newview/skins/default/xui/zh/panel_login_first.xml diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 6449141b8c..f100fb8c1a 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -197,7 +197,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, mCallback(callback), mCallbackData(cb_data), mListener(std::make_unique(this)), - mFirstLoginThisInstall(gSavedSettings.getBOOL("FirstLoginThisInstall")), mUsernameLength(0), mPasswordLength(0), mLocationLength(0), @@ -217,15 +216,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()); LLLineEditor* password_edit(getChild("password_edit")); @@ -246,8 +237,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, mGridPanel = getChild("grid_panel"); std::string current_grid = LLGridManager::getInstance()->getGrid(); - if (!mFirstLoginThisInstall) - { + LLComboBox* favorites_combo = getChild("start_location_combo"); updateLocationSelectorsVisibility(); // separate so that it can be called from preferences favorites_combo->setReturnCallback(boost::bind(&LLPanelLogin::onClickConnect, false)); @@ -277,7 +267,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, 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 @@ -347,15 +336,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("username_combo")->getSimple(); - mUsernameLength = static_cast(user_defined_name.length()); - updateLoginButtons(); - return; - } - // Clear the combo. LLComboBox* combo = getChild("start_location_combo"); if (!combo) return; @@ -575,16 +555,8 @@ 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 cred = gSecAPIHandler->loadCredential(LLGridManager::getInstance()->getGrid()); - sInstance->populateUserList(cred); - } + LLPointer cred = gSecAPIHandler->loadCredential(LLGridManager::getInstance()->getGrid()); + sInstance->populateUserList(cred); } // static @@ -1102,8 +1074,7 @@ void LLPanelLogin::onRememberUserCheck(void*) LLComboBox* user_combo(sInstance->getChild("username_combo")); bool remember = remember_name->getValue().asBoolean(); - if (!sInstance->mFirstLoginThisInstall - && user_combo->getCurrentIndex() != -1 + if (user_combo->getCurrentIndex() != -1 && !remember) { remember = true; @@ -1216,17 +1187,14 @@ void LLPanelLogin::updateLoginButtons() { mLoginBtn->setEnabled(mUsernameLength != 0 && mPasswordLength != 0 && !mAlertNotif); - if (!mFirstLoginThisInstall) + LLComboBox* user_combo = getChild("username_combo"); + LLCheckBoxCtrl* remember_name = getChild("remember_name"); + if (user_combo->getCurrentIndex() != -1) { - LLComboBox* user_combo = getChild("username_combo"); - LLCheckBoxCtrl* remember_name = getChild("remember_name"); - if (user_combo->getCurrentIndex() != -1) - { - remember_name->setValue(true); - LLCheckBoxCtrl* remember_pass = getChild("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("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 credential) diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h index 14528443cf..f7104a94b1 100644 --- a/indra/newview/llpanellogin.h +++ b/indra/newview/llpanellogin.h @@ -124,7 +124,6 @@ private: static LLPanelLogin* sInstance; static bool sCapslockDidNotification; - bool mFirstLoginThisInstall; static bool sCredentialSet; diff --git a/indra/newview/skins/default/xui/de/panel_login_first.xml b/indra/newview/skins/default/xui/de/panel_login_first.xml deleted file mode 100644 index 038001157e..0000000000 --- a/indra/newview/skins/default/xui/de/panel_login_first.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - http://secondlife.com/account/request.php?lang=de - - - https://join.secondlife.com/ - - - - - - - -