diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-07-18 16:48:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-18 16:48:33 -0700 |
| commit | ca008cfc3165eefeb42b2894e3e99ecf4c21f0c8 (patch) | |
| tree | 82a2b75f4d6ff4650877b774559558065e9ab81a /indra/newview/llstartup.cpp | |
| parent | 8e3d4048d4197a40009f04169aeb3ec710cd6fa1 (diff) | |
| parent | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (diff) | |
Merge pull request #292 from secondlife/brad/DRTVWR-559-xcode-14.3
Merge xcode-14.3 compatibility branch into DRTVWR-559
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 = ""; |