From 58d107130b41d9e1380079db6f29578a56ee99fb Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 22 Jul 2013 17:25:21 -0700
Subject: ACME-741: Fixed: Do not try to get FB account info when the user is
not connected to FB (otherwise, it autoconnects...)
---
indra/newview/llfloatersocial.cpp | 2 --
1 file changed, 2 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp
index d734518cbb..acfb0960be 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));
--
cgit v1.2.3
From 9c97f4f5ef46369714b8e7beb2cb990f06b0f096 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 22 Jul 2013 18:47:05 -0700
Subject: ACME-734 : Fix: Do not log empty URLs, refocus on page if the focus
was there
---
indra/newview/llfloaterwebcontent.cpp | 37 ++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 16 deletions(-)
(limited to 'indra/newview')
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()
--
cgit v1.2.3