diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-29 20:38:39 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-29 20:38:39 +0300 |
| commit | 8ee63b463f555c48b47f7d0b91eedb8db5ec0ebd (patch) | |
| tree | 1a5273ec5d69ada31e1938b5eb5335067c9387da /indra/newview | |
| parent | 84a0ae682ab18f0366528d7d6d449ab95a1fb3f9 (diff) | |
SL-15668 getNodeID is no longer reliable
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llhasheduniqueid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llhasheduniqueid.cpp b/indra/newview/llhasheduniqueid.cpp index 03192d3e61..38dafc167f 100644 --- a/indra/newview/llhasheduniqueid.cpp +++ b/indra/newview/llhasheduniqueid.cpp @@ -35,8 +35,8 @@ bool llHashedUniqueID(unsigned char id[MD5HEX_STR_SIZE]) bool idIsUnique = true; LLMD5 hashed_unique_id; unsigned char unique_id[MAC_ADDRESS_BYTES]; - if ( LLUUID::getNodeID(unique_id) - || LLMachineID::getUniqueID(unique_id, sizeof(unique_id)) + if ( LLMachineID::getUniqueID(unique_id, sizeof(unique_id)) + || LLUUID::getNodeID(unique_id) ) { hashed_unique_id.update(unique_id, MAC_ADDRESS_BYTES); |