diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:30:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:30:16 -0500 |
| commit | 9b42503379bc2e9698545543670306961f7db991 (patch) | |
| tree | dad8c7ac114c65b70c5b6ec6cdc803d7307b365d /indra/llcommon | |
| parent | 4514d8c5c3bd5e16ba8d84214ecd164cd0740864 (diff) | |
| parent | d993d6347a2c9f559d9ee8c5ac8e9292944156f0 (diff) | |
merge latest changes from Ima with 3.6.14-release
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.. |