diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 12:57:25 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 12:57:25 -0700 |
commit | 9fc74de1a18bbb209ee2524b0c833b3016ffc5e3 (patch) | |
tree | 134b4ef690e12793dbfe60167625b65dcec6e996 /indra/llcommon/llsys.cpp | |
parent | 0d6f1d125eb0f6de766d617978a022fc74b4aec7 (diff) | |
parent | 909e784deb73d1da73928448cddb219af42ada93 (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; |