diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-03 14:49:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-03 14:49:33 -0500 |
| commit | f79615caced2cebb8e71b388b0dea45776b2f24b (patch) | |
| tree | 44d7434cc5046976b03169bc74da71620c237a2b /indra/newview/tests/lllogininstance_test.cpp | |
| parent | 4e922949a9a1e508a698ce5a03657f1417252d9f (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (diff) | |
Automated merge up from viewer-development
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; } //----------------------------------------------------------------------------- |