diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:09:11 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:09:11 +0200 |
| commit | 30c381406c4891cce439c66ca17b26247f0a698c (patch) | |
| tree | 2196833344c813e2d6bf4b963adc517c30050697 /indra/newview/tests/llsechandler_basic_test.cpp | |
| parent | 764788c9bc549715aed119c639ac919067f38a92 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-530-maint
# Conflicts:
# doc/contributions.txt
Diffstat (limited to 'indra/newview/tests/llsechandler_basic_test.cpp')
| -rw-r--r-- | indra/newview/tests/llsechandler_basic_test.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp index 4c8d6c51b0..da742370fc 100644 --- a/indra/newview/tests/llsechandler_basic_test.cpp +++ b/indra/newview/tests/llsechandler_basic_test.cpp @@ -121,6 +121,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; +} S32 LLMachineID::init() { return 1; } |