diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-10 15:14:20 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-10 15:14:20 +0800 |
| commit | d5d514d07f334953c674ef64d4474b2decef24b3 (patch) | |
| tree | edfec588bc211674f53cd7c759eedb77dcf1e4ec /indra/llcommon | |
| parent | 8c21d1177314c61c7e555d56ae4994f51003ee64 (diff) | |
| parent | 13c0708cc70078e5118dd88de57d4ffd52f85024 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llprocessor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index e119e5d0b7..1696a165a2 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -699,7 +699,8 @@ private: memset(cpu_vendor, 0, len); sysctlbyname("machdep.cpu.vendor", (void*)cpu_vendor, &len, NULL, 0); cpu_vendor[0x1f] = 0; - setInfo(eVendor, cpu_vendor); + // M series CPUs don't provide this field so if empty, just fall back to Apple. + setInfo(eVendor, (cpu_vendor[0] != '\0') ? cpu_vendor : "Apple"); setInfo(eStepping, getSysctlInt("machdep.cpu.stepping")); setInfo(eModel, getSysctlInt("machdep.cpu.model")); |