diff options
author | Oz Linden <oz@lindenlab.com> | 2013-11-21 14:08:38 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-11-21 14:08:38 -0500 |
commit | 45bc601563337b99ca3dc0d733196d7a00dd54d7 (patch) | |
tree | 2d49bf2ce2589947d1b80770f5fa7a312a1f908b /indra/llcommon/llsys.cpp | |
parent | 4f2a7167b6d6b3b278b39ea7b97beb89f6abb5ee (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.. |