From 16709a9bef3ebf24c60eac29f7c5cb743e855da1 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 18 Jul 2013 21:05:41 -0700 Subject: ACME-734 : WIP : Implemented changes for https URL in the address bar and added options to web floater to hide history and disable buttons --- indra/newview/llfacebookconnect.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfacebookconnect.cpp') diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index ac92fc6ed5..eb9b93161c 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -287,7 +287,11 @@ 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(false); + p.url(url).show_chrome(true); + p.url(url).allow_address_entry(false); + p.url(url).allow_back_forward_navigation(false); + p.url(url).save_url_history(false); + p.url(url).trusted_content(true); LLFloaterReg::showInstance("fbc_web", p); //LLUrlAction::openURLExternal(url); -- cgit v1.2.3 From eadb42eb9d202c38ca2761be07ee4376863550ce Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 19 Jul 2013 22:35:45 -0700 Subject: ACME-734 : Fix : Feed browsing history but without the query part --- indra/newview/llfacebookconnect.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llfacebookconnect.cpp') diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index f0b735c5ca..7c1e7b3b16 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -321,7 +321,6 @@ void LLFacebookConnect::openFacebookWeb(std::string url) p.url(url).show_chrome(true); p.url(url).allow_address_entry(false); p.url(url).allow_back_forward_navigation(false); - p.url(url).save_url_history(false); p.url(url).trusted_content(true); LLFloaterReg::showInstance("fbc_web", p); -- cgit v1.2.3