summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-20 23:57:48 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-21 03:44:40 +0300
commit1b5d151c156f0528e58c02b494d4b515ea9cb11c (patch)
treefae0dcc0263dbeccbf4b3a6af7698764353128da /indra/llcommon
parenteb9a3ea9024a8049fcc51bcf12cde0c6ff1a06c4 (diff)
SL-15997 Windows 11 detection
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llsys.cpp23
1 files changed, 16 insertions, 7 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index e94973ac29..4fe5b6bf20 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -140,13 +140,7 @@ LLOSInfo::LLOSInfo() :
#if LL_WINDOWS
- if (IsWindowsVersionOrGreater(11, 0, 0))
- {
- mMajorVer = 11;
- mMinorVer = 0;
- mOSStringSimple = "Microsoft Windows 11 ";
- }
- else if (IsWindows10OrGreater())
+ if (IsWindows10OrGreater())
{
mMajorVer = 10;
mMinorVer = 0;
@@ -279,6 +273,21 @@ LLOSInfo::LLOSInfo() :
ubr = data;
}
}
+
+ 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";
+ }
}
mOSString = mOSStringSimple;