diff options
| author | simon <none@none> | 2013-12-09 16:11:09 -0800 |
|---|---|---|
| committer | simon <none@none> | 2013-12-09 16:11:09 -0800 |
| commit | 50cba7940fbea7602f6b55df85fb9a2d2b47279b (patch) | |
| tree | 269464d15a8d4a8803535b843e8ce7dcac7414cb /indra/llcommon/llsys.cpp | |
| parent | 1a456c2e41905e93e393dc2dda0d143ee7611275 (diff) | |
| parent | 4a09065691b6a3461ff2f4541abb3accade207fe (diff) | |
Merge in downstream code for 3.6.13
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.. |