diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-21 16:57:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-21 16:57:27 -0400 |
| commit | 687a925fda8fcd99d495a37ddee2b17b390d2751 (patch) | |
| tree | 09861a24ffdf00487896f531d76eba799ee57d7b | |
| parent | 192f51f4267ad083b0a6f67d808f473e2fc89168 (diff) | |
| parent | 7614ceff24129643ecb96f57f0491507e4ff8dbd (diff) | |
pull late release change back from viewer-pre-release
| -rw-r--r-- | .hgtags | 2 | ||||
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 13 |
2 files changed, 4 insertions, 11 deletions
@@ -138,3 +138,5 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release 77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-release a9abb9633a266c8d2fe62411cfd1c86d32da72bf DRTVWR-60_2.7.1-release a9abb9633a266c8d2fe62411cfd1c86d32da72bf 2.7.1-release +e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb DRTVWR-63_2.7.2-beta1 +e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb 2.7.2-beta1 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); |