diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatersocial.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llfloaterwebcontent.cpp | 37 |
2 files changed, 21 insertions, 18 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index f0bd1bb71a..2eb112d328 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -650,8 +650,6 @@ void LLSocialAccountPanel::onVisibilityChange(const LLSD& new_visibility) LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLSocialAccountPanel"); LLEventPumps::instance().obtain("FacebookConnectState").listen("LLSocialAccountPanel", boost::bind(&LLSocialAccountPanel::onFacebookConnectStateChange, this, _1)); - LLFacebookConnect::instance().loadFacebookInfo(); - LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLSocialAccountPanel"); LLEventPumps::instance().obtain("FacebookConnectInfo").listen("LLSocialAccountPanel", boost::bind(&LLSocialAccountPanel::onFacebookConnectInfoChange, this)); diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 129e1f0e2a..62eb9dba8e 100755 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -358,7 +358,9 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent { mSecureLockIcon->setVisible(true); // Hack : we move the text a bit to make space for the lock icon. + BOOL browser_has_focus = mWebBrowser->hasFocus(); set_current_url(" " + mCurrentURL); + mWebBrowser->setFocus(browser_has_focus); } else { @@ -406,26 +408,29 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent void LLFloaterWebContent::set_current_url(const std::string& url) { - if (!mCurrentURL.empty()) + if (!url.empty()) { - // Clean up the current browsing list to show true URL - mAddressCombo->remove(mDisplayURL); - mAddressCombo->add(mCurrentURL); - } + if (!mCurrentURL.empty()) + { + // Clean up the current browsing list to show true URL + mAddressCombo->remove(mDisplayURL); + mAddressCombo->add(mCurrentURL); + } - // Update current URLs - mDisplayURL = url; - mCurrentURL = url; - LLStringUtil::trim(mCurrentURL); + // Update current URLs + mDisplayURL = url; + mCurrentURL = url; + LLStringUtil::trim(mCurrentURL); - // Serialize url history into the system URL History manager - LLURLHistory::removeURL("browser", mCurrentURL); - LLURLHistory::addURL("browser", mCurrentURL); + // Serialize url history into the system URL History manager + LLURLHistory::removeURL("browser", mCurrentURL); + LLURLHistory::addURL("browser", mCurrentURL); - // Clean up browsing list (prevent dupes) and add/select new URL to it - mAddressCombo->remove(mCurrentURL); - mAddressCombo->add(mDisplayURL); - mAddressCombo->selectByValue(mDisplayURL); + // Clean up browsing list (prevent dupes) and add/select new URL to it + mAddressCombo->remove(mCurrentURL); + mAddressCombo->add(mDisplayURL); + mAddressCombo->selectByValue(mDisplayURL); + } } void LLFloaterWebContent::onClickForward() |