diff options
| author | skolb <none@none> | 2009-10-14 10:10:46 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-14 10:10:46 -0700 |
| commit | 1b1550f284316b244a10a4a6604fedb5d6b18965 (patch) | |
| tree | 2416742bb0fa10c646c8490c39c3442fa73f1924 /indra/llcommon/llsys.cpp | |
| parent | 1d63b145481021c5d0ed16bd0c10c320170d0cf5 (diff) | |
| parent | b5768a69b18936282cf55f0a1ecb72ba19849836 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 4d03c4d40d..127baa737d 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -128,8 +128,16 @@ LLOSInfo::LLOSInfo() : mOSStringSimple = "Microsoft Windows Vista "; else mOSStringSimple = "Microsoft Windows Vista Server "; } + else if(osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1) + { + if(osvi.wProductType == VER_NT_WORKSTATION) + mOSStringSimple = "Microsoft Windows 7 "; + else mOSStringSimple = "Microsoft Windows 7 Server "; + } else // Use the registry on early versions of Windows NT. { + mOSStringSimple = "Microsoft Windows (unrecognized) "; + HKEY hKey; WCHAR szProductType[80]; DWORD dwBufLen; |