diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-08-16 08:25:50 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-08-16 08:25:50 -0400 |
| commit | 6cf6f81ae865d4e15b715a93408c7970b6936ce8 (patch) | |
| tree | c8232f05b4fb6ae8551d44d11517e89454be55ef /indra/newview/llstartup.cpp | |
| parent | 5430efbb31cfc0f57eac7fd130bb43aafa85143a (diff) | |
| parent | 48aecb5c8d10926caa62feb94231c3019162836a (diff) | |
DRTVWR-588: Merge branch 'fix-monterey' into DRTVWR-588-monterey
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 75cbe94592..22c6e8bf2a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3260,7 +3260,7 @@ LLSD transform_cert_args(LLPointer<LLCertificate> cert) // are actually arrays, and we want to format them as comma separated // strings, so special case those. LLSDSerialize::toXML(cert_info[iter->first], std::cout); - if((iter->first== std::string(CERT_KEY_USAGE)) | + if((iter->first == std::string(CERT_KEY_USAGE)) || (iter->first == std::string(CERT_EXTENDED_KEY_USAGE))) { value = ""; |