diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:36:12 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:36:12 -0800 |
| commit | 7365ee2d9d79813b6f515d333b63210d583038b5 (patch) | |
| tree | bd237c8141a0b5643038640f4bc24d1fb6d5fd65 /indra/newview/tests/lllogininstance_test.cpp | |
| parent | 049b00a6f10d50609055810b0800f49476b351d2 (diff) | |
| parent | ab100825bd0064dc64b9ef8bea1c70bc04090716 (diff) | |
merge
Diffstat (limited to 'indra/newview/tests/lllogininstance_test.cpp')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index b902c7ab09..309e9e9ee3 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -181,7 +181,7 @@ void LLUIColorTable::saveUserSettings(void)const {} //----------------------------------------------------------------------------- #include "../llversioninfo.h" -const std::string &LLVersionInfo::getVersionAndChannel() { return VIEWERLOGIN_VERSION_CHANNEL; } +const std::string &LLVersionInfo::getChannelAndVersion() { return VIEWERLOGIN_VERSION_CHANNEL; } const std::string &LLVersionInfo::getChannel() { return VIEWERLOGIN_CHANNEL; } //----------------------------------------------------------------------------- |