diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-12-05 15:26:38 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-12-05 15:26:38 -0500 |
| commit | da135de77dea24427f5e658ebac43b77c215cc9b (patch) | |
| tree | b6ccf4971d081a6dfc78a2729d015a7f01e912b2 /indra/llcommon | |
| parent | b2d769534c82de2ac7b36f11ce6fab61f3e0d378 (diff) | |
| parent | fc4f6e2dacfc8944b1536004fed80c4ca3a24544 (diff) | |
Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llsd.h | 2 | ||||
| -rwxr-xr-x | indra/llcommon/llsys.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h index a3792c1f9d..deb87d7497 100755 --- a/indra/llcommon/llsd.h +++ b/indra/llcommon/llsd.h @@ -321,7 +321,7 @@ public: typedef std::vector<LLSD>::iterator array_iterator; typedef std::vector<LLSD>::const_iterator array_const_iterator; typedef std::vector<LLSD>::reverse_iterator reverse_array_iterator; - + array_iterator beginArray(); array_iterator endArray(); array_const_iterator beginArray() const; 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.. |