diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-05 12:54:15 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-05 12:54:15 -0800 |
| commit | 11e3f8c3a1209c17814d90978a1c0b80225bc122 (patch) | |
| tree | 2d4640a9da1df8354c9f30a5c7d013905c9a5637 /indra | |
| parent | 0dfc7f6145b0c179ee66dbc7539b7c3d9a68cc37 (diff) | |
ACME-1043 : Use a clean browser for connection to Flickr and Twitter as well
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llflickrconnect.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/lltwitterconnect.cpp | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp index 3a21933b63..8f9f55c1ea 100644 --- a/indra/newview/llflickrconnect.cpp +++ b/indra/newview/llflickrconnect.cpp @@ -276,10 +276,12 @@ void LLFlickrConnect::openFlickrWeb(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("flickr_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 "flickr_web". When a mouse event diff --git a/indra/newview/lltwitterconnect.cpp b/indra/newview/lltwitterconnect.cpp index e015867df2..7942b21319 100644 --- a/indra/newview/lltwitterconnect.cpp +++ b/indra/newview/lltwitterconnect.cpp @@ -276,10 +276,12 @@ void LLTwitterConnect::openTwitterWeb(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("twitter_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 "twitter_web". When a mouse event |