Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
a4cabf80
Commit
a4cabf80
authored
5 years ago
by
andreykproductengine
Browse files
Options
Downloads
Patches
Plain Diff
SL-12590 SL-12608 Fixed wrong states
parent
b304adc0
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llpanellogin.cpp
+7
-4
7 additions, 4 deletions
indra/newview/llpanellogin.cpp
with
7 additions
and
4 deletions
indra/newview/llpanellogin.cpp
+
7
−
4
View file @
a4cabf80
...
@@ -1230,6 +1230,8 @@ void LLPanelLogin::updateLoginButtons()
...
@@ -1230,6 +1230,8 @@ void LLPanelLogin::updateLoginButtons()
if
(
user_combo
->
getCurrentIndex
()
!=
-
1
)
if
(
user_combo
->
getCurrentIndex
()
!=
-
1
)
{
{
remember_name
->
setValue
(
true
);
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
}
// Note: might be good idea to do "else remember_name->setValue(mRememberedState)" but it might behave 'weird' to user
}
}
}
}
...
@@ -1239,6 +1241,8 @@ void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential)
...
@@ -1239,6 +1241,8 @@ void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential)
LLComboBox
*
user_combo
=
getChild
<
LLComboBox
>
(
"username_combo"
);
LLComboBox
*
user_combo
=
getChild
<
LLComboBox
>
(
"username_combo"
);
user_combo
->
removeall
();
user_combo
->
removeall
();
user_combo
->
clear
();
user_combo
->
clear
();
user_combo
->
setValue
(
std
::
string
());
getChild
<
LLUICtrl
>
(
"password_edit"
)
->
setValue
(
std
::
string
());
mUsernameLength
=
0
;
mUsernameLength
=
0
;
mPasswordLength
=
0
;
mPasswordLength
=
0
;
...
@@ -1261,9 +1265,7 @@ void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential)
...
@@ -1261,9 +1265,7 @@ void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential)
if
(
credential
.
isNull
()
||
!
user_combo
->
setSelectedByValue
(
LLSD
(
credential
->
userID
()),
true
))
if
(
credential
.
isNull
()
||
!
user_combo
->
setSelectedByValue
(
LLSD
(
credential
->
userID
()),
true
))
{
{
// selection failed, just deselect whatever might be selected
// selection failed, fields will be mepty
user_combo
->
setValue
(
std
::
string
());
getChild
<
LLUICtrl
>
(
"password_edit"
)
->
setValue
(
std
::
string
());
updateLoginButtons
();
updateLoginButtons
();
}
}
else
else
...
@@ -1278,7 +1280,8 @@ void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential)
...
@@ -1278,7 +1280,8 @@ void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential)
const
LLSD
&
ident
=
credential
->
getIdentifier
();
const
LLSD
&
ident
=
credential
->
getIdentifier
();
if
(
ident
.
isMap
()
&&
ident
.
has
(
"type"
))
if
(
ident
.
isMap
()
&&
ident
.
has
(
"type"
))
{
{
user_combo
->
add
(
LLPanelLogin
::
getUserName
(
credential
),
credential
->
userID
(),
ADD_BOTTOM
,
TRUE
);
// this llsd might hold invalid credencial (failed login), so
// do not add to the list, just set field.
setFields
(
credential
);
setFields
(
credential
);
}
}
else
else
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment