diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-08-03 08:13:47 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-08-03 08:13:47 -0700 |
| commit | 76aeb6ea706e5448f92ae137ac5e8fbc38a762b2 (patch) | |
| tree | c1d22aedb6ee0322bd719428e60cf581fce9e849 /indra | |
| parent | 35278461964653fc032995afdc366f096c937a14 (diff) | |
| parent | 163430156878fa7073aa51a96aa10c75c60f0c41 (diff) | |
Pull merge from lindenlab/viewer-fbc
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfacebookconnect.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index 98fd8b1d7b..645f62579d 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -333,7 +333,9 @@ void LLFacebookConnect::openFacebookWeb(std::string url) p.url(url).allow_address_entry(false); p.url(url).allow_back_forward_navigation(false); p.url(url).trusted_content(true); - LLFloaterReg::showInstance("fbc_web", p); + LLFloater *floater = LLFloaterReg::showInstance("fbc_web", p); + //TODO Gil: Hack to give the focus to the web browser to show cursor, will fix + gFocusMgr.setKeyboardFocus( floater ); //LLUrlAction::openURLExternal(url); } |