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

SL-13835 Fixed warning for certificate

meow-7.2.2
Andrey Kleshchev 2020-08-27 12:33:32 +03:00
parent 31c13ffe25
commit be48bee98f
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llstartup.cpp
View File

@ -1134,11 +1134,11 @@ bool idle_startup()
}
catch (LLCertException &cert_exception)
{
LL_WARNS("LLStartup", "SECAPI") << "Caught " << cert_exception.what() << " certificate expception on getCertificate()" << LL_ENDL;
LL_WARNS("LLStartup", "SECAPI") << "Caught " << cert_exception.what() << " certificate expception on getCertificate("<< response["certificate"] << ")" << LL_ENDL;
LLSD args;
args["REASON"] = LLTrans::getString(cert_exception.what());
LLNotificationsUtil::add("GeneralCertificateError", args, response,
LLNotificationsUtil::add("GeneralCertificateErrorShort", args, response,
general_cert_done);
reset_login();

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

@ -3691,6 +3691,17 @@ Could not teleport to [SLURL] as it's on a different grid ([GRID]) than the curr
yestext="OK"/>
</notification>
<notification icon="alertmodal.tga"
name="GeneralCertificateErrorShort"
type="alertmodal">
Could not connect to the server.
[REASON]
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification icon="alertmodal.tga"
name="GeneralCertificateError"
type="alertmodal">

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -107,6 +107,7 @@ Voice Server Version: [VOICE_VERSION]
<string name="CertExpired">The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator.</string>
<string name="CertKeyUsage">The certificate returned by the server could not be used for SSL. Please contact your Grid administrator.</string>
<string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain. Please contact your Grid administrator.</string>
<string name="CertInvalid">Could not load cetrificate. Please contact your Grid administrator.</string>
<string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator.</string>
<string name="CertAllocationFailure">Failed to allocate openssl memory for certificate.</string>