diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-23 11:13:24 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-23 11:13:24 -0500 |
| commit | f02a85c36aadae7bdb8ab5be565b282671ba017a (patch) | |
| tree | 33c9ff36bd8cd707f498178624689e399533e191 /indra/llcommon | |
| parent | d91fe250ace0ebbc0f22bbe8b60a3a542cb1e6be (diff) | |
| parent | 43388552a07bfcfed5e674097303054e1cacf6ae (diff) | |
merge some linux fixes and OPEN-287
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llprocessor.cpp | 2 | ||||
| -rwxr-xr-x | indra/llcommon/llsys.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 1ee3c7edb0..e3e1d0c391 100755 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -778,7 +778,7 @@ private: setInfo(eFamily, family); } - setInfo(eFamilyName, compute_CPUFamilyName(cpuinfo["vendor_id"].c_str(), family)); + setInfo(eFamilyName, compute_CPUFamilyName(cpuinfo["vendor_id"].c_str(), family, 0)); // setInfo(eExtendedModel, getSysctlInt("machdep.cpu.extmodel")); // setInfo(eBrandID, getSysctlInt("machdep.cpu.brand")); diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index c9db73eb99..1a66612e87 100755 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -677,6 +677,7 @@ U32 LLOSInfo::getProcessVirtualSizeKB() #if LL_WINDOWS #endif #if LL_LINUX +# define STATUS_SIZE 2048 LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); if (status_filep) { |