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

switched FB auth to in-viewer browser for ACME-733

meow-7.2.2
Cho 2013-07-16 22:15:14 +01:00
parent 9988e4739f
commit fdea8c66de
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfacebookconnect.cpp
View File

@ -40,6 +40,9 @@
#include "lltrans.h"
#include "llevents.h"
#include "llfloaterwebcontent.h"
#include "llfloaterreg.h"
boost::scoped_ptr<LLEventPump> LLFacebookConnect::sStateWatcher(new LLEventStream("FacebookConnectState"));
boost::scoped_ptr<LLEventPump> LLFacebookConnect::sContentWatcher(new LLEventStream("FacebookConnectContent"));
@ -274,7 +277,12 @@ LLFacebookConnect::LLFacebookConnect()
void LLFacebookConnect::openFacebookWeb(std::string url)
{
LLUrlAction::openURLExternal(url);
// Open the URL in an internal browser window without navigation UI
LLFloaterWebContent::Params p;
p.url(url).show_chrome(false);
LLFloaterReg::showInstance("web_content", p);
//LLUrlAction::openURLExternal(url);
}
std::string LLFacebookConnect::getFacebookConnectURL(const std::string& route)