diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-03 11:38:46 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-03 11:38:46 -0800 |
| commit | 0ea483ce60c96d7f17cd461c617449f70a21d7a4 (patch) | |
| tree | 4c0f1cf5788511a6fb520dce49aad00d12461ff0 /indra/newview/tests/lllogininstance_test.cpp | |
| parent | c767276ce62f18a295d64054beda438250abd4ae (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (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; } //----------------------------------------------------------------------------- |