diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-07-31 02:38:13 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-07-31 02:38:13 -0700 |
| commit | f4a6a434fab9bbce34e5c11408323967c5b5e22e (patch) | |
| tree | 8269201e5045d0d4ae18a9af6fa3db3ffa54a881 /indra/newview/llstartup.cpp | |
| parent | 3d73326516c73f880f46e28f14b6c515307ede91 (diff) | |
| parent | ca008cfc3165eefeb42b2894e3e99ecf4c21f0c8 (diff) | |
Merge branch 'DRTVWR-559' into DRTVWR-583
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 = ""; |