diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-11 20:41:46 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-11 20:41:46 +0300 |
| commit | dde268cf852144eb641babf975a5905ca2c96a74 (patch) | |
| tree | 6896b6ce31c25175adbf0b3131149c469d2093e0 /indra/newview/tests/lllogininstance_test.cpp | |
| parent | e1a3ce0d7465fd1c441168b0fcf5b849f47bab4e (diff) | |
| parent | 89cde15fb8c52071805af78e61848e743f2ab2f1 (diff) | |
Merge branch 'master' into DRTVWR-483
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) { |