diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-09-01 12:21:51 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-09-01 12:21:51 -0400 |
| commit | bae94e434090f83d12941ca25aca13203db671b6 (patch) | |
| tree | b83d09a5eb4780c5f3077ac73b10199582f6adcd /indra/llcommon/llsys.cpp | |
| parent | 3069355a6f33b7bbcfc8c493910a40e6836249e1 (diff) | |
| parent | 3dc23bc1831e84b8d8288d9a4f006f9597d9443a (diff) | |
Merged login-api with viewer-2.0.0-3 up through r132290.
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; |