diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
| commit | 6fbf39f9b319106e39f80b8641acaba122d02e0a (patch) | |
| tree | e47af1ff1bd1db52fd93c11d857b11387bacf01a /indra/newview/tests/lllogininstance_test.cpp | |
| parent | 05200cf827d9a6263adc4905bf41a4905bce2659 (diff) | |
| parent | 64a9ad0f5f52dac633a76e39335a7def2573b82e (diff) | |
Merged in lmr4-merge-6.4.6 (pull request #213)
Merge master v6.4.6 into DRTVWR-497 (VS2017)
Diffstat (limited to 'indra/newview/tests/lllogininstance_test.cpp')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index 2edad30493..57f2d31eab 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -202,8 +202,6 @@ void LLUIColorTable::saveUserSettings(void)const {} //----------------------------------------------------------------------------- #include "../llversioninfo.h" -const std::string &LLVersionInfo::getVersion() { return VIEWERLOGIN_VERSION; } -const std::string &LLVersionInfo::getChannel() { return VIEWERLOGIN_CHANNEL; } bool llHashedUniqueID(unsigned char* id) { |