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/llprocessor.cpp | |
parent | d91fe250ace0ebbc0f22bbe8b60a3a542cb1e6be (diff) | |
parent | 43388552a07bfcfed5e674097303054e1cacf6ae (diff) |
merge some linux fixes and OPEN-287
Diffstat (limited to 'indra/llcommon/llprocessor.cpp')
-rwxr-xr-x | indra/llcommon/llprocessor.cpp | 2 |
1 files changed, 1 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")); |