diff --git a/doc/contributions.txt b/doc/contributions.txt index 965225b970676652435657b2ba942f950e86991d..d58652ec4bc869a1761f9df527765c26a4744ddc 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 89eb94110688d0fcc320c2dca858994a630526f4..583742f970b4303d122272fad6bd8dfa74352ce1 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;