diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-11-16 16:41:15 +0200 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-11-16 17:44:15 +0200 |
commit | 132c536d9c05be2d2fd2dcef3ea6c7ae135fa5d2 (patch) | |
tree | 376ae6246fce7ebbb9b7c620ca9c64bab51ca163 /indra/newview/tests/lllogininstance_test.cpp | |
parent | 83ae032ff349581199212129a03a7c44899a3e17 (diff) | |
parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) |
Merge branch 'master' into DRTVWR-539
Diffstat (limited to 'indra/newview/tests/lllogininstance_test.cpp')
-rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index f9abc8b25d..8d1956957c 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -308,6 +308,10 @@ S32 LLMachineID::getUniqueID(unsigned char *unique_id, size_t len) memcpy(unique_id, gMACAddress, len); return 1; } +S32 LLMachineID::getLegacyID(unsigned char *unique_id, size_t len) +{ + return 0; +} //----------------------------------------------------------------------------- // misc std::string xml_escape_string(const std::string& in) |