SL-15997 Windows 11 detection

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;