diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-08-19 12:12:48 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-08-19 12:12:48 -0700 |
| commit | 01ee14c0fc71e2b84d1f489b9856f87b667ad521 (patch) | |
| tree | 182d11a13f8bd3aa3af464685c4ebba21e71aef0 /indra/newview | |
| parent | c8c143e7741d2b93b589d770b64c265228293564 (diff) | |
SL-323: put back mac addr hash
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 999165528a..7a0df8d207 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2300,6 +2300,7 @@ if (LL_TESTS) set_source_files_properties( lllogininstance.cpp + llhasheduniqueid.cpp PROPERTIES LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}" ) diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index b9e9c12aec..374efa2986 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -192,11 +192,19 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia // (re)initialize the request params with creds. LLSD request_params = user_credential->getLoginParams(); + unsigned char hashed_unique_id_string[MD5HEX_STR_SIZE]; + if ( ! llHashedUniqueID(hashed_unique_id_string) ) + { + + LL_WARNS() << "Not providing a unique id in request params" << LL_ENDL; + + } request_params["start"] = construct_start_string(); request_params["agree_to_tos"] = false; // Always false here. Set true in request_params["read_critical"] = false; // handleTOSResponse request_params["last_exec_event"] = mLastExecEvent; request_params["last_exec_duration"] = mLastExecDuration; + request_params["mac"] = (char*)hashed_unique_id_string; request_params["version"] = LLVersionInfo::getVersion(); request_params["channel"] = LLVersionInfo::getChannel(); request_params["platform"] = mPlatform; |