From 442abdaac7e6af5a91d5ddf6ab02270e190289ff Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 3 Dec 2021 00:49:33 +0200
Subject: [PATCH] SL-16438 Machine id for Linux is always 0
---
doc/contributions.txt | 1 +
indra/newview/llmachineid.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 965225b9706..d58652ec4bc 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1107,6 +1107,7 @@ Nicky Dasmijn
SL-11072
SL-13141
SL-13642
+ SL-16438
Nicky Perian
OPEN-1
STORM-1087
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp
index 89eb9411068..583742f970b 100644
--- a/indra/newview/llmachineid.cpp
+++ b/indra/newview/llmachineid.cpp
@@ -466,7 +466,7 @@ S32 LLMachineID::init()
}
}
#else
- unsigned char * staticPtr = (unsigned char *)(&static_legacy_id[0]);
+ unsigned char * staticPtr = (unsigned char *)(&static_unique_id[0]);
ret_code = LLUUID::getNodeID(staticPtr);
has_static_unique_id = true;
has_static_legacy_id = false;
--
GitLab