diff options
author | Merov Linden <merov@lindenlab.com> | 2013-12-04 18:02:04 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-12-04 18:02:04 -0800 |
commit | a36c4f45b4bf03c707089398bccf62a12ac44f0b (patch) | |
tree | 8936ad0037900db5961f0596992750695869fc8d /indra/newview/llfacebookconnect.cpp | |
parent | ffff7ef59f43c66f966f259cb30e069a2445aa66 (diff) |
ACME-1043 : WIP : Add an argument to open trusted content with js and other enabled options, bypassing prefs
Diffstat (limited to 'indra/newview/llfacebookconnect.cpp')
-rw-r--r-- | indra/newview/llfacebookconnect.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index 0a662b4671..8cde871cd1 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -377,10 +377,12 @@ void LLFacebookConnect::openFacebookWeb(std::string url) { // Open the URL in an internal browser window without navigation UI LLFloaterWebContent::Params p; - p.url(url).show_chrome(true); - p.url(url).allow_address_entry(false); - p.url(url).allow_back_forward_navigation(false); - p.url(url).trusted_content(true); + p.url(url); + p.show_chrome(true); + p.allow_address_entry(false); + p.allow_back_forward_navigation(false); + p.trusted_content(true); + p.clean_browser(true); LLFloater *floater = LLFloaterReg::showInstance("fbc_web", p); //the internal web browser has a bug that prevents it from gaining focus unless a mouse event occurs first (it seems). //So when showing the internal web browser, set focus to it's containing floater "fbc_web". When a mouse event |