livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with http://hg.secondlife.com/mesh-development

meow-7.2.2
Xiaohong Bao 2011-04-26 16:43:36 -06:00
parent 764412f9b5 cf0aa6981a
commit d2d07046b7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanellogin.cpp
View File

@ -34,6 +34,7 @@
#include "llmd5.h"
#include "llsecondlifeurls.h"
#include "v4color.h"
#include "llversionviewer.h"
#include "llappviewer.h"
#include "llbutton.h"
@ -861,12 +862,20 @@ void LLPanelLogin::loadLoginPage()
LLVersionInfo::getShortVersion().c_str(),
LLVersionInfo::getBuild());
char* curl_channel = curl_escape(LLVersionInfo::getChannel().c_str(), 0);
char* curl_channel ;
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);