diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
| commit | 915ade1029eb39fcd8f3b997b4b8cf2b394c1eb9 (patch) | |
| tree | 577c0d98b21d05f0b6f28241f2ab2b7ee31f8618 /indra/llcommon/llsys.cpp | |
| parent | dd7b0f96157bdfbdd8892cc8aa209182ae777380 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
merge changes for 3.6.11-release
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rwxr-xr-x | indra/llcommon/llsys.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index bb17725c9c..e63045659e 100755 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -315,11 +315,11 @@ LLOSInfo::LLOSInfo() : } else { - if(osvi.wProductType == VER_NT_WORKSTATION) - mOSStringSimple = "Microsoft Windows 8 "; - else - mOSStringSimple = "Windows Server 2012 "; - } + if(osvi.wProductType == VER_NT_WORKSTATION) + mOSStringSimple = "Microsoft Windows 8 "; + else + mOSStringSimple = "Windows Server 2012 "; + } } ///get native system info if available.. |