From 6ad892aa95b50a4bbcd369657d47d428ee248f96 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Fri, 23 Jul 2010 15:25:49 -0700 Subject: 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. --- indra/newview/lllogininstance.cpp | 6 ++++-- 1 file 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 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(); -- cgit v1.2.3