livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-9699 Do not disable 'remember me' checkbox

master
andreykproductengine 2020-01-03 20:12:46 +02:00
parent b611925357
commit 37ca582a2d
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llpanellogin.cpp
View File

@ -560,7 +560,6 @@ void LLPanelLogin::populateFields(LLPointer<LLCredential> credential, bool remem
{
sInstance->getChild<LLUICtrl>("remember_name")->setValue(remember_user);
sInstance->populateUserList(credential);
remember_check->setEnabled(remember_user);
}
}
@ -1112,14 +1111,22 @@ void LLPanelLogin::onUserListCommit(void*)
}
// static
// At the moment only happens if !mFirstLoginThisInstall
void LLPanelLogin::onRememberUserCheck(void*)
{
if (sInstance)
if (sInstance && !sInstance->mFirstLoginThisInstall)
{
LLCheckBoxCtrl* remember_name(sInstance->getChild<LLCheckBoxCtrl>("remember_name"));
LLCheckBoxCtrl* remember_psswrd(sInstance->getChild<LLCheckBoxCtrl>("remember_check"));
LLComboBox* user_combo(sInstance->getChild<LLComboBox>("username_combo"));
bool remember = remember_name->getValue().asBoolean();
if (user_combo->getCurrentIndex() != -1 && !remember)
{
remember = true;
remember_name->setValue(true);
LLNotificationsUtil::add("LoginCantRemoveUsername");
}
remember_psswrd->setEnabled(remember);
}
}
@ -1185,12 +1192,15 @@ 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");
remember_name->setEnabled(user_combo->getCurrentIndex() == -1);
}
if (!mFirstLoginThisInstall)
{
LLComboBox* user_combo = getChild<LLComboBox>("username_combo");
LLCheckBoxCtrl* remember_name = getChild<LLCheckBoxCtrl>("remember_name");
if (user_combo->getCurrentIndex() != -1)
{
remember_name->setValue(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)

8
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -3550,6 +3550,14 @@ If this is your first time using [SECOND_LIFE], you will need to create an accou
yestext="Create Account..."/>
</notification>
<notification
icon="alertmodal.tga"
name="LoginCantRemoveUsername"
type="alertmodal">
<tag>fail</tag>
Already remembered user can be forgotten from Me &gt; Preferences &gt; Advanced &gt; Remembered Usernames.
</notification>
<notification
icon="alertmodal.tga"
name="LoginPacketNeverReceived"