diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-04-01 21:47:22 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-01 21:47:22 -0700 |
commit | aa0a129b6798f8be554d1d9d41cbd217a0040daf (patch) | |
tree | a206cf638fa4a8f48dd869e0ccf12b7b6a428972 /indra/newview/llviewerstats.cpp | |
parent | 98695056c2fbfb91de805d9e2a01cde23668c4d3 (diff) | |
parent | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (diff) |
Automated Merge
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
-rw-r--r-- | indra/newview/llviewerstats.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index b7c265be59..bdc34d0f18 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -768,9 +768,11 @@ 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", - gMACAddress[0],gMACAddress[1],gMACAddress[2], - gMACAddress[3],gMACAddress[4],gMACAddress[5]); + MACAddress[0],MACAddress[1],MACAddress[2], + MACAddress[3],MACAddress[4],MACAddress[5]); system["mac_address"] = macAddressString; system["serial_number"] = LLAppViewer::instance()->getSerialNumber(); std::string gpu_desc = llformat( |