diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-27 10:24:53 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-27 10:24:53 -0400 |
| commit | a3328658725dd12efbb1a9107e4c6f0612772c12 (patch) | |
| tree | cc9707083f3cef32a92a481ffbae5b0a7ef92630 /indra/newview/tests/lllogininstance_test.cpp | |
| parent | 34ab18d0c2f7de57e42ded0c3d94ee0fec17da28 (diff) | |
| parent | d55264bf13520fc7adab347565ee13cc30fc8656 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/tests/lllogininstance_test.cpp')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index 1c29feec5f..347a5e8ab8 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -226,6 +226,16 @@ S32 LLNotification::getSelectedOption(const LLSD& notification, const LLSD& resp return response.asInteger(); } +//----------------------------------------------------------------------------- +#include "../llmachineid.h" +unsigned char gMACAddress[MAC_ADDRESS_BYTES] = {77,21,46,31,89,2}; + +S32 LLMachineID::getUniqueID(unsigned char *unique_id, size_t len) +{ + memcpy(unique_id, gMACAddress, len); + return 1; +} +//----------------------------------------------------------------------------- // misc std::string xml_escape_string(const std::string& in) { |