diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-09-18 15:22:25 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-09-18 15:22:25 -0400 |
| commit | bb1d4592bdc83f23a60c864ef291c58912d93935 (patch) | |
| tree | dfb29728340b1fef59227775ecc47aaab117fdd2 /indra/llcommon/llsys.cpp | |
| parent | 91645140d495da4faf1e4905bb8b96c6af579277 (diff) | |
| parent | 8e7ba92eb9e0371385e3de9a76cc11355be8a974 (diff) | |
Merged latest viewer/viewer-20 into login-api.
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; |