diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-03 00:49:33 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-03 00:49:33 +0200 |
| commit | 442abdaac7e6af5a91d5ddf6ab02270e190289ff (patch) | |
| tree | 450f8a82959f1cfb2ed9ffb9ffe1005b428cf602 | |
| parent | 42fcfd03d5b4f376fd4254b3b675637656d3c668 (diff) | |
SL-16438 Machine id for Linux is always 0
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llmachineid.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 965225b970..d58652ec4b 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 89eb941106..583742f970 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; |