diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-20 23:29:38 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-06-21 11:46:25 +0300 |
| commit | e4fd1bd71ef31b34ea92e2b5b5be4e08aad42269 (patch) | |
| tree | 6d3c492e0045eb5512406cfcbffba503d36b3cea | |
| parent | 68963019cd62fedf94ade25c83f22804ec237818 (diff) | |
viewer#1808 Use bugsplat's setAttribute for app state
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rw-r--r-- | indra/llcommon/llsys.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 6 |
3 files changed, 11 insertions, 17 deletions
diff --git a/autobuild.xml b/autobuild.xml index b7eb7ad045..c47661df18 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -164,11 +164,11 @@ <key>archive</key> <map> <key>hash</key> - <string>d152f19f4a5a9c8013f006e19b1fcd88692bccf1</string> + <string>cd1f1d55a2488657ec2253774b3a414621f81b24</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.0.7-527603a/bugsplat-1.0.7-527603a-darwin64-527603a.tar.zst</string> + <string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.1.5-71fc41e/bugsplat-1.1.1-9599607655-darwin64-9599607655.tar.zst</string> </map> <key>name</key> <string>darwin64</string> @@ -178,11 +178,11 @@ <key>archive</key> <map> <key>hash</key> - <string>1364da04333570b73c771e4f4acd1bacc7fc3f02</string> + <string>9fb0615d17988bd89a2e5ae6d4d19e150afb54a9</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.0.7-527603a/bugsplat-4.0.3.0-527603a-windows64-527603a.tar.zst</string> + <string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.1.5-71fc41e/bugsplat-5.0.1.0-9599607655-windows64-9599607655.tar.zst</string> </map> <key>name</key> <string>windows64</string> @@ -195,7 +195,7 @@ <key>copyright</key> <string>Copyright 2003-2017, BugSplat</string> <key>version</key> - <string>4.0.3.0-527603a</string> + <string>5.0.1.0-71fc41e</string> <key>name</key> <string>bugsplat</string> <key>description</key> diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 496ec0d869..cfb05873df 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -226,16 +226,8 @@ LLOSInfo::LLOSInfo() : if (mBuild >= 22000) { // At release Windows 11 version was 10.0.22000.194 - // Windows 10 version was 10.0.19043.1266 - // There is no warranty that Win10 build won't increase, - // so until better solution is found or Microsoft updates - // SDK with IsWindows11OrGreater(), indicate "10/11" - // - // Current alternatives: - // Query WMI's Win32_OperatingSystem for OS string. Slow - // and likely to return 'compatibility' string. - // Check presence of dlls/libs or may be their version. - mOSStringSimple = "Microsoft Windows 10/11 "; + // According to microsoft win 10 won't ever get that far. + mOSStringSimple = "Microsoft Windows 11 "; } } diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 5ae1e2f43c..3cdae041fc 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -77,6 +77,7 @@ #include "BugSplat.h" #include "boost/json.hpp" // Boost.Json #include "llagent.h" // for agent location +#include "llstartup.h" #include "llviewerregion.h" #include "llvoavatarself.h" // for agent name @@ -138,8 +139,7 @@ namespace // We don't have an email address for any user. Hijack this // metadata field for the platform identifier. sBugSplatSender->setDefaultUserEmail( - WCSTR(STRINGIZE(LLOSInfo::instance().getOSStringSimple() << " (" - << ADDRESS_SIZE << "-bit)"))); + WCSTR(LLOSInfo::instance().getOSStringSimple())); if (gAgentAvatarp) { @@ -152,6 +152,8 @@ namespace // LL_ERRS message, when there is one sBugSplatSender->setDefaultUserDescription(WCSTR(LLError::getFatalMessage())); + // App state + sBugSplatSender->setAttribute(WCSTR(L"AppState"), WCSTR(LLStartUp::getStartupStateString())); if (gAgent.getRegion()) { |