summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llpanellogin.cpp5
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml8
2 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 953f234a53..8374eea2e0 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -858,12 +858,17 @@ void LLPanelLogin::onClickConnect(void *)
// The start location SLURL has already been sent to LLStartUp::setStartSLURL
std::string username = sInstance->getChild<LLUICtrl>("username_combo")->getValue().asString();
+ std::string password = sInstance->getChild<LLUICtrl>("password_edit")->getValue().asString();
if(username.empty())
{
// user must type in something into the username field
LLNotificationsUtil::add("MustHaveAccountToLogIn");
}
+ else if(password.empty())
+ {
+ LLNotificationsUtil::add("MustEnterPasswordToLogIn");
+ }
else
{
LLPointer<LLCredential> cred;
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b4c5cba1fd..5f0fa70e29 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1222,6 +1222,14 @@ You can not wear that item because it has not yet loaded. Please try again in a
<tag>fail</tag>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="MustEnterPasswordToLogIn"
+ type="alertmodal">
+ <tag>fail</tag>
+Please enter your Password to log in.
+ </notification>
+
<notification
icon="alertmodal.tga"
name="MustHaveAccountToLogIn"