diff options
| author | Callum Prentice <callum@gmail.com> | 2017-04-21 13:39:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-04-21 13:39:24 -0700 |
| commit | 8846f9c7c19f85118da7d5601ad1dd14e491b6f5 (patch) | |
| tree | f92318cc31af07cf822df2261b58719afa851672 /indra | |
| parent | 362ffb213108ba7c5e582aa9d72a44a82f5455a3 (diff) | |
| parent | 7a6a2db289581e43c509ca7dfff7d9b72897a10e (diff) | |
Automated merge with tip of viewer64
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerstats.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index b4d0bb6823..a49a9ca840 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -606,6 +606,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia request_params["channel"] = LLVersionInfo::getChannel(); request_params["platform"] = mPlatform; request_params["platform_version"] = mPlatformVersion; + request_params["address_size"] = ADDRESS_SIZE; request_params["id0"] = mSerialNumber; request_params["host_id"] = gSavedSettings.getString("HostID"); request_params["extended_errors"] = true; // request message_id and message_args diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index f52c82dab7..b907783b1f 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -491,6 +491,7 @@ void send_stats() system["ram"] = (S32) gSysMemory.getPhysicalMemoryKB().value(); system["os"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple(); system["cpu"] = gSysCPU.getCPUString(); + system["address_size"] = ADDRESS_SIZE; unsigned char MACAddress[MAC_ADDRESS_BYTES]; LLUUID::getNodeID(MACAddress); std::string macAddressString = llformat("%02x-%02x-%02x-%02x-%02x-%02x", |