diff options
| author | Cho <cho@lindenlab.com> | 2013-07-16 22:15:14 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-07-16 22:15:14 +0100 |
| commit | fdea8c66de408a2054bbe86b1967cea11409c313 (patch) | |
| tree | f0b3ccbae5e61c2f4abe69847ccd7e0addfda9e7 /indra/newview | |
| parent | 9988e4739f2af029732c66d0bc5f03e6f43c5685 (diff) | |
switched FB auth to in-viewer browser for ACME-733
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfacebookconnect.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index 0d11658d07..cf77dd365b 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -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) |