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

pull late release change back from viewer-pre-release

meow-7.2.2
Oz Linden 2011-06-21 16:57:27 -04:00
parent 192f51f426 7614ceff24
commit 687a925fda
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgtags
View File

@ -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

13
indra/newview/llpanellogin.cpp
View File

@ -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);