diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
| commit | 52293aa4bb7af45d2c3733f20982f4acb030c2d8 (patch) | |
| tree | f963815f91b6259ea403d41807d19b69e759897e /indra/newview/llviewerstats.cpp | |
| parent | 516ec63f52245a777725d29efe3c35e4e4e72936 (diff) | |
| parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
| -rw-r--r-- | indra/newview/llviewerstats.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index bdc34d0f18..b7c265be59 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -768,11 +768,9 @@ void send_stats() system["ram"] = (S32) gSysMemory.getPhysicalMemoryKB(); system["os"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple(); system["cpu"] = gSysCPU.getCPUString(); - unsigned char MACAddress[MAC_ADDRESS_BYTES]; - LLUUID::getNodeID(MACAddress); std::string macAddressString = llformat("%02x-%02x-%02x-%02x-%02x-%02x", - MACAddress[0],MACAddress[1],MACAddress[2], - MACAddress[3],MACAddress[4],MACAddress[5]); + gMACAddress[0],gMACAddress[1],gMACAddress[2], + gMACAddress[3],gMACAddress[4],gMACAddress[5]); system["mac_address"] = macAddressString; system["serial_number"] = LLAppViewer::instance()->getSerialNumber(); std::string gpu_desc = llformat( |