diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-14 11:52:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-14 11:52:41 -0400 |
| commit | 4d71ffb430879c3d24d910465ca7afa3fae0b141 (patch) | |
| tree | cdc157ff7b8b2229b1de79212e7c2a88d8e7d8f2 | |
| parent | 612ff7b6b3f3abb56ff6bf8331e2a1cd04c04066 (diff) | |
MAINT-7640: code review fixes
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 30 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 13 |
2 files changed, 26 insertions, 17 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index b953534e13..30fa23835b 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -299,35 +299,35 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event) boost::bind(&LLLoginInstance::handleTOSResponse, this, _1, "read_critical")); } - else if(reason_response == "update") - { + else if(reason_response == "update") + { // This shouldn't happen - the viewer manager should have forced an update; // possibly the user ran the viewer directly and bypassed the update check std::string required_version = response["message_args"]["VERSION"]; - LL_WARNS() << "Login failed because an update to version " << required_version << " is required." << LL_ENDL; + LL_WARNS() << "Login failed because an update to version " << required_version << " is required." << LL_ENDL; - if (gViewerWindow) - gViewerWindow->setShowProgress(FALSE); + if (gViewerWindow) + gViewerWindow->setShowProgress(FALSE); - LLSD data(LLSD::emptyMap()); + LLSD data(LLSD::emptyMap()); data["VERSION"] = required_version; LLNotificationsUtil::add("RequiredUpdate", data, LLSD::emptyMap(), boost::bind(&LLLoginInstance::handleLoginDisallowed, this, _1, _2)); - } - else if(reason_response == "key") - { + } + else if(reason_response == "key") + { // this is a password problem or other restriction // an appropriate message has already been displayed attemptComplete(); } - else - { - LL_WARNS() << "Login failed for an unknown reason: " << LLSDOStreamer<LLSDNotationFormatter>(response) << LL_ENDL; + else + { + LL_WARNS() << "Login failed for an unknown reason: " << LLSDOStreamer<LLSDNotationFormatter>(response) << LL_ENDL; - if (gViewerWindow) - gViewerWindow->setShowProgress(FALSE); + if (gViewerWindow) + gViewerWindow->setShowProgress(FALSE); LLNotificationsUtil::add("LoginFailedUnknown", LLSD::emptyMap(), LLSD::emptyMap(), boost::bind(&LLLoginInstance::handleLoginDisallowed, this, _1, _2)); - } + } } void LLLoginInstance::handleLoginDisallowed(const LLSD& notification, const LLSD& response) diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index c1e82d7be3..3f39ea36f3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3825,6 +3825,14 @@ Please set the object for sale and try again. <notification icon="alertmodal.tga" + name="FinishedRawDownload" + type="alertmodal"> +Finished download of raw terrain file to: +[DOWNLOAD_PATH]. + </notification> + + <notification + icon="alertmodal.tga" name="RequiredUpdate" type="alertmodal"> Version [VERSION] is required for login. @@ -3840,11 +3848,12 @@ Please download from https://secondlife.com/support/downloads/ icon="alertmodal.tga" name="LoginFailedUnknown" type="alertmodal"> -Login failed for an unrecognized reason. +Sorry, login failed for an unrecognized reason. +If you continue to get this message, please check the [SUPPORT_SITE]. <tag>confirm</tag> <usetemplate name="okbutton" - yestext="Sorry"/> + yestext="Quit"/> </notification> <notification |