diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-05-04 11:39:03 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-05-04 11:39:03 -0700 |
| commit | a22d62e8edd8448ced210a39ce996472a54fa1c9 (patch) | |
| tree | 82ec1d027821a83d498a848141249adfd4e36310 /indra/newview/llappviewer.cpp | |
| parent | 52f8ff9961aeb463fcbf6fa22314575442aa5352 (diff) | |
| parent | e7c5b9fb0f75b1e75acf7c99eded5f7b697cdc60 (diff) | |
Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-559
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b2349e9f74..6efbaeacf7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3191,15 +3191,16 @@ LLSD LLAppViewer::getViewerInfo() const // LLFloaterAbout. LLSD info; auto& versionInfo(LLVersionInfo::instance()); - info["VIEWER_VERSION"] = LLSDArray(versionInfo.getMajor())(versionInfo.getMinor())(versionInfo.getPatch())(versionInfo.getBuild()); + info["VIEWER_VERSION"] = llsd::array(versionInfo.getMajor(), versionInfo.getMinor(), + versionInfo.getPatch(), versionInfo.getBuild()); info["VIEWER_VERSION_STR"] = versionInfo.getVersion(); info["CHANNEL"] = versionInfo.getChannel(); - info["ADDRESS_SIZE"] = ADDRESS_SIZE; - std::string build_config = versionInfo.getBuildConfig(); - if (build_config != "Release") - { - info["BUILD_CONFIG"] = build_config; - } + info["ADDRESS_SIZE"] = ADDRESS_SIZE; + std::string build_config = versionInfo.getBuildConfig(); + if (build_config != "Release") + { + info["BUILD_CONFIG"] = build_config; + } // return a URL to the release notes for this viewer, such as: // https://releasenotes.secondlife.com/viewer/2.1.0.123456.html |