diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 12:09:18 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 12:09:18 -0800 |
| commit | b6edd74775e07ce392b0a1785cfc61338c890dad (patch) | |
| tree | c01e3111d3016e5f6e5453f88d8e5aa30c7ced19 /indra/newview/llpanellogin.cpp | |
| parent | 1139584b026db86fd20364d0eb21b6e2351f8fb1 (diff) | |
| parent | 8d21105a8c2b6bff98b4f3b91a614a4710d4b7ea (diff) | |
Merged latest lindenlab/viewer-development with mani_linden/viewer-development for bacground updater work.
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 467aefc60f..cf567fb208 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -230,7 +230,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, getChild<LLPanel>("login")->setDefaultBtn("connect_btn"); - std::string channel = gSavedSettings.getString("VersionChannelName"); + std::string channel = LLVersionInfo::getChannel(); std::string version = llformat("%s (%d)", LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild()); @@ -817,7 +817,7 @@ void LLPanelLogin::loadLoginPage() LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild()); - char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0); + char* curl_channel = curl_escape(LLVersionInfo::getChannel().c_str(), 0); char* curl_version = curl_escape(version.c_str(), 0); oStr << "&channel=" << curl_channel; |