diff options
author | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:26:30 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:38:18 -0700 |
commit | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (patch) | |
tree | 4b74d7dbc258ec9236ab0154b6a83d6b36ce7d63 /indra/newview/llstartup.cpp | |
parent | bb5e40a1fdc35b3a41925f91684bc76854338cfb (diff) | |
parent | 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (diff) |
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
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 73234552e5..e84894b395 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3259,7 +3259,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 = ""; |