diff options
| author | callum <none@none> | 2010-12-03 11:55:08 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-12-03 11:55:08 -0800 |
| commit | 6ec12a2cd9bc7ba6a8d8451fd8eb86ba43b2cd8c (patch) | |
| tree | d8ef6121c4d018de65bc06f70f92cec4d402d3d9 /indra/newview/tests/lllogininstance_test.cpp | |
| parent | 1c946e8e4dcb6a6fcdfafeca82d9ba1db9f09e54 (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (diff) | |
Merge after pull 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; } //----------------------------------------------------------------------------- |