diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-29 14:32:37 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-29 14:32:37 +0300 |
commit | 2ee039c736f64c91bb4f16e403360cddb0089707 (patch) | |
tree | e565fac793bebb6d97fb6f2ec35bc484615a749f /indra/newview/llappviewerwin32.cpp | |
parent | e687250b90e63e71c9115ed97c3efd60ceefbcb6 (diff) | |
parent | 3e322df4fb71cbeff27aab85bb48c7da595b548c (diff) |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r-- | indra/newview/llappviewerwin32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 625a7b7fba..ad817d5747 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -683,7 +683,7 @@ bool LLAppViewerWin32::init() } else { - boost::json::error_code ec; + boost::system::error_code ec; boost::json::value build_data = boost::json::parse(inf, ec); if(ec.failed()) { |