diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:18:46 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:18:46 -0700 |
| commit | 4ddaa866dde7a92e56617a32464e0667de3759ef (patch) | |
| tree | d28e7e39f8a5f4a1070482154824fbfb2a7b52e8 /indra/llcommon/llsys.cpp | |
| parent | a5453d45feaceb713c7cece76d88c2d2b8f825c6 (diff) | |
| parent | 80b682d4b4dd1256ee09dd3327d2c51e3adee0b5 (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 4737421289..3652eeba72 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -161,8 +161,16 @@ LLOSInfo::LLOSInfo() : 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; |