diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-03 17:37:00 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-03 17:37:00 -0500 |
| commit | 32db8988ffab8778de106dc769228089bec8aad1 (patch) | |
| tree | c29018f2067dd514e50ed59456a20bec41628c89 /indra/newview/tests/lllogininstance_test.cpp | |
| parent | 46a2bbf8dad21364e8f4842d8b6426fbae543167 (diff) | |
| parent | 8e7632552b8541a37cca6ae623140d70f74deaac (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; } //----------------------------------------------------------------------------- |