Skip to content
Snippets Groups Projects
Commit 8846f9c7 authored by Callum Prentice's avatar Callum Prentice
Browse files

Automated merge with tip of viewer64

parents 362ffb21 7a6a2db2
Branches
Tags
No related merge requests found
...@@ -606,6 +606,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia ...@@ -606,6 +606,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia
request_params["channel"] = LLVersionInfo::getChannel(); request_params["channel"] = LLVersionInfo::getChannel();
request_params["platform"] = mPlatform; request_params["platform"] = mPlatform;
request_params["platform_version"] = mPlatformVersion; request_params["platform_version"] = mPlatformVersion;
request_params["address_size"] = ADDRESS_SIZE;
request_params["id0"] = mSerialNumber; request_params["id0"] = mSerialNumber;
request_params["host_id"] = gSavedSettings.getString("HostID"); request_params["host_id"] = gSavedSettings.getString("HostID");
request_params["extended_errors"] = true; // request message_id and message_args request_params["extended_errors"] = true; // request message_id and message_args
......
...@@ -491,6 +491,7 @@ void send_stats() ...@@ -491,6 +491,7 @@ void send_stats()
system["ram"] = (S32) gSysMemory.getPhysicalMemoryKB().value(); system["ram"] = (S32) gSysMemory.getPhysicalMemoryKB().value();
system["os"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple(); system["os"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
system["cpu"] = gSysCPU.getCPUString(); system["cpu"] = gSysCPU.getCPUString();
system["address_size"] = ADDRESS_SIZE;
unsigned char MACAddress[MAC_ADDRESS_BYTES]; unsigned char MACAddress[MAC_ADDRESS_BYTES];
LLUUID::getNodeID(MACAddress); LLUUID::getNodeID(MACAddress);
std::string macAddressString = llformat("%02x-%02x-%02x-%02x-%02x-%02x", std::string macAddressString = llformat("%02x-%02x-%02x-%02x-%02x-%02x",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment