diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-23 15:25:49 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-23 15:25:49 -0700 |
| commit | 6ad892aa95b50a4bbcd369657d47d428ee248f96 (patch) | |
| tree | 692aa830868f9a4c27db50242047c91f45639729 | |
| parent | 0c5a5934d87cb7e64cb8db96551009b9b9ed8be9 (diff) | |
Fix EXT-8483 second iteration: use old nodeId when available but try new machine id when not so reported id stays consistent with prior versions most of the time.
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 32c358368a..ae8efc01a3 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -169,8 +169,10 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia char hashed_unique_id_string[MD5HEX_STR_SIZE]; /* Flawfinder: ignore */ LLMD5 hashed_unique_id; unsigned char unique_id[MAC_ADDRESS_BYTES]; - if(LLMachineID::getUniqueID(unique_id, sizeof(unique_id)) == 0) { - llerrs << "Failed to get an id; cannot uniquely identify this machine." << llendl; + if(LLUUID::getNodeID(unique_id) == 0) { + if(LLMachineID::getUniqueID(unique_id, sizeof(unique_id)) == 0) { + llerrs << "Failed to get an id; cannot uniquely identify this machine." << llendl; + } } hashed_unique_id.update(unique_id, MAC_ADDRESS_BYTES); hashed_unique_id.finalize(); |