diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
| commit | 27cf0ec7f34887ada651307fe438ef0d627bf67f (patch) | |
| tree | 90611a41d9ad25b98db6899745208c8aab51c150 /indra/llcommon/llsys.cpp | |
| parent | c6aa86750c22c20dca6895695386e2357b953bbd (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
Merge with 3.6.11
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.. |