diff options
| author | Jiao Li <angela@lindenlab.com> | 2009-09-28 06:17:18 +0000 |
|---|---|---|
| committer | Jiao Li <angela@lindenlab.com> | 2009-09-28 06:17:18 +0000 |
| commit | acd7d31f3ea161374f2fb32bc50defe43586af8d (patch) | |
| tree | a48c7910d34070db3a483baa25579cf2200a1fcb /indra | |
| parent | 09bf3c1fec107e9e66514837d208ef62a6b67b91 (diff) | |
EXT-735 Login failed if start location wasn't defined by user -- reviewed by oreh
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 11 |
2 files changed, 23 insertions, 4 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 9caa751854..150fd399c6 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -837,14 +837,22 @@ void LLPanelLogin::onClickConnect(void *) std::string first = sInstance->childGetText("first_name_edit"); std::string last = sInstance->childGetText("last_name_edit"); - if (!first.empty() && !last.empty()) + LLComboBox* combo = sInstance->getChild<LLComboBox>("start_location_combo"); + std::string combo_text = combo->getSimple(); + + if (first.empty() || last.empty()) { - // has both first and last name typed - sInstance->mCallback(0, sInstance->mCallbackData); + LLNotifications::instance().add("MustHaveAccountToLogIn"); + } + else if( (combo_text=="<Type region name>" || combo_text =="") + && LLURLSimString::sInstance.mSimString =="") + { + LLNotifications::instance().add("StartRegionEmpty"); } else { - LLNotifications::instance().add("MustHaveAccountToLogIn"); + // has both first and last name typed + sInstance->mCallback(0, sInstance->mCallbackData); } } } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 80d501b63e..044194a4ed 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -996,6 +996,17 @@ There was a problem saving a compiled script due to the following reason: [REASO <notification icon="alertmodal.tga" + name="StartRegionEmpty" + type="alertmodal"> +Oops, Your Start Region is not defined. +Please type the Region name in Start Location box or choose My Last Location or My Home as your Start Location. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="CouldNotStartStopScript" type="alertmodal"> Could not start or stop the script because the object it is on could not be found. |