diff options
author | Richard Linden <none@none> | 2011-06-13 16:05:17 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-06-13 16:05:17 -0700 |
commit | d6f6b640e473de946467af71cdbda2b88301608f (patch) | |
tree | 4c13cc762eb5d42578c3c9409e525782736a7af6 /indra | |
parent | ad3182c4ff01b207d93a47a8dbeec89454514b98 (diff) |
EXP-885 FIX v2.7.1 Release Viewer Update Available splash prompts the user to donwload the v2.7.2 Beta
Backed out changeset: 3a391669629d
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpanellogin.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index d0810d0772..27f341b4f6 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -34,7 +34,6 @@ #include "llmd5.h" #include "llsecondlifeurls.h" #include "v4color.h" -#include "llversionviewer.h" #include "llappviewer.h" #include "llbutton.h" @@ -748,20 +747,12 @@ void LLPanelLogin::loadLoginPage() LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild()); - char* curl_channel ; + char* curl_channel = curl_escape(LLVersionInfo::getChannel().c_str(), 0); char* curl_version = curl_escape(version.c_str(), 0); - if(strcmp(LLVersionInfo::getChannel().c_str(), LL_CHANNEL)) - { - curl_channel = curl_escape(LLVersionInfo::getChannel().c_str(), 0); - } - else //if LL_CHANNEL, direct it to "Second Life Beta Viewer". - { - curl_channel = curl_escape("Second Life Beta Viewer", 0); - } oStr << "&channel=" << curl_channel; oStr << "&version=" << curl_version; - + curl_free(curl_channel); curl_free(curl_version); |