diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
| commit | d6e8f32b8073d85db59f2a45a10d622b71c859ae (patch) | |
| tree | 953c5efd60338604c229824467270cd8d5a458ce /indra/llcommon/llsys.cpp | |
| parent | add9298c1e4d74bdb5503722a6c795ea6f30fa11 (diff) | |
| parent | 53c972a521cbb92c6c9390c41b250a41dc22cd5a (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; |