summaryrefslogtreecommitdiff
path: root/indra/newview/lltwitterconnect.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-26 09:12:08 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-26 09:12:08 -0400
commit3a7513b5875b86c247dd49fe78b8fab955ba5e0a (patch)
tree3f942d50b41fd090550541af01bb50d23d845c09 /indra/newview/lltwitterconnect.cpp
parent06954294b8739dd51abe75e3710da6e496b353d4 (diff)
parentdc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff)
DRTVWR-453: Merge up to latest viewer-release.
Diffstat (limited to 'indra/newview/lltwitterconnect.cpp')
-rw-r--r--indra/newview/lltwitterconnect.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/lltwitterconnect.cpp b/indra/newview/lltwitterconnect.cpp
index 9b7c13b57d..5d598aaebe 100644
--- a/indra/newview/lltwitterconnect.cpp
+++ b/indra/newview/lltwitterconnect.cpp
@@ -380,13 +380,10 @@ LLTwitterConnect::LLTwitterConnect()
void LLTwitterConnect::openTwitterWeb(std::string url)
{
- // Open the URL in an internal browser window without navigation UI
LLFloaterWebContent::Params p;
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).