1 files changed, 61 insertions, 27 deletions

diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 21b171446f..3e3ac7eb90 100755
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -30,6 +30,7 @@
 #include "lliconctrl.h"
 #include "llfloaterreg.h"
 #include "llhttpconstants.h"
+#include "llfacebookconnect.h"
 #include "lllayoutstack.h"
 #include "llpluginclassmedia.h"
 #include "llprogressbar.h"
@@ -47,7 +48,8 @@ LLFloaterWebContent::_Params::_Params()
 	id("id"),
 	window_class("window_class", "web_content"),
 	show_chrome("show_chrome", true),
-	allow_address_entry("allow_address_entry", true),
+    allow_address_entry("allow_address_entry", true),
+    allow_back_forward_navigation("allow_back_forward_navigation", true),
 	preferred_media_size("preferred_media_size"),
 	trusted_content("trusted_content", false),
 	show_page_title("show_page_title", true)
@@ -66,7 +68,11 @@ LLFloaterWebContent::LLFloaterWebContent( const Params& params )
 	mBtnReload(NULL),
 	mBtnStop(NULL),
 	mUUID(params.id()),
-	mShowPageTitle(params.show_page_title)
+	mShowPageTitle(params.show_page_title),
+    mAllowNavigation(true),
+    mCurrentURL(""),
+    mDisplayURL(""),
+    mSecureURL(false)
 {
 	mCommitCallbackRegistrar.add( "WebContent.Back", boost::bind( &LLFloaterWebContent::onClickBack, this ));
 	mCommitCallbackRegistrar.add( "WebContent.Forward", boost::bind( &LLFloaterWebContent::onClickForward, this ));
@@ -98,7 +104,7 @@ BOOL LLFloaterWebContent::postBuild()
 
 	// cache image for secure browsing
 	mSecureLockIcon = getChild< LLIconCtrl >("media_secure_lock_flag");
-
+    
 	// initialize the URL history using the system URL History manager
 	initializeURLHistory();
 
@@ -244,6 +250,7 @@ void LLFloaterWebContent::open_media(const Params& p)
 	getChild<LLLayoutPanel>("status_bar")->setVisible(p.show_chrome);
 	getChild<LLLayoutPanel>("nav_controls")->setVisible(p.show_chrome);
 	bool address_entry_enabled = p.allow_address_entry && !p.trusted_content;
+    mAllowNavigation = p.allow_back_forward_navigation;
 	getChildView("address")->setEnabled(address_entry_enabled);
 	getChildView("popexternal")->setEnabled(address_entry_enabled);
 
@@ -288,6 +295,16 @@ void LLFloaterWebContent::onOpen(const LLSD& key)
 //virtual
 void LLFloaterWebContent::onClose(bool app_quitting)
 {
+    // If we close the web browsing window showing the facebook login, we need to signal to this object that the connection will not happen
+    LLFloater* fbc_web = LLFloaterReg::getInstance("fbc_web");
+    if (fbc_web == this)
+    {
+        if (!LLFacebookConnect::instance().isConnected())
+        {
+            LLFacebookConnect::instance().setConnectionState(LLFacebookConnect::FB_CONNECTION_FAILED);
+        }
+    }
+    
 	LLViewerMedia::proxyWindowClosed(mUUID);
 	destroy();
 }
@@ -296,8 +313,11 @@ void LLFloaterWebContent::onClose(bool app_quitting)
 void LLFloaterWebContent::draw()
 {
 	// this is asynchronous so we need to keep checking
-	mBtnBack->setEnabled( mWebBrowser->canNavigateBack() );
-	mBtnForward->setEnabled( mWebBrowser->canNavigateForward() );
+	mBtnBack->setEnabled( mWebBrowser->canNavigateBack() && mAllowNavigation);
+	mBtnForward->setEnabled( mWebBrowser->canNavigateForward() && mAllowNavigation);
+
+    // Show/hide the lock icon
+    mSecureLockIcon->setVisible(mSecureURL && !mAddressCombo->hasFocus());
 
 	LLFloater::draw();
 }
@@ -343,19 +363,6 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
 		// we populate the status bar with URLs as they change so clear it now we're done
 		const std::string end_str = "";
 		mStatusBarText->setText( end_str );
-
-		// decide if secure browsing icon should be displayed
-		std::string prefix =  std::string("https://");
-		std::string test_prefix = mCurrentURL.substr(0, prefix.length());
-		LLStringUtil::toLower(test_prefix);
-		if(test_prefix == prefix)
-		{
-			mSecureLockIcon->setVisible(true);
-		}
-		else
-		{
-			mSecureLockIcon->setVisible(false);
-		}
 	}
 	else if(event == MEDIA_EVENT_CLOSE_REQUEST)
 	{
@@ -398,15 +405,40 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
 
 void LLFloaterWebContent::set_current_url(const std::string& url)
 {
-	mCurrentURL = url;
-
-	// serialize url history into the system URL History manager
-	LLURLHistory::removeURL("browser", mCurrentURL);
-	LLURLHistory::addURL("browser", mCurrentURL);
-
-	mAddressCombo->remove( mCurrentURL );
-	mAddressCombo->add( mCurrentURL );
-	mAddressCombo->selectByValue( mCurrentURL );
+    if (!url.empty())
+    {
+        if (!mCurrentURL.empty())
+        {
+            // Clean up the current browsing list to show true URL
+            mAddressCombo->remove(mDisplayURL);
+            mAddressCombo->add(mCurrentURL);
+        }
+
+        // Update current URL
+        mCurrentURL = url;
+        LLStringUtil::trim(mCurrentURL);
+
+        // Serialize url history into the system URL History manager
+        LLURLHistory::removeURL("browser", mCurrentURL);
+        LLURLHistory::addURL("browser", mCurrentURL);
+
+		// Check if this is a secure URL
+		static const std::string secure_prefix = std::string("https://");
+		std::string prefix = mCurrentURL.substr(0, secure_prefix.length());
+		LLStringUtil::toLower(prefix);
+        mSecureURL = (prefix == secure_prefix);
+        
+        // Hack : we move the text a bit to make space for the lock icon in the secure URL case
+		mDisplayURL = (mSecureURL ? "      " + mCurrentURL : mCurrentURL);
+
+        // Clean up browsing list (prevent dupes) and add/select the new URL to it
+        mAddressCombo->remove(mCurrentURL);
+        mAddressCombo->add(mDisplayURL);
+        mAddressCombo->selectByValue(mDisplayURL);
+
+        // Set the focus back to the web page. When setting the url, there's no point to leave the focus anywhere else.
+		mWebBrowser->setFocus(TRUE);
+    }
 }
 
 void LLFloaterWebContent::onClickForward()
@@ -450,6 +482,7 @@ void LLFloaterWebContent::onEnterAddress()
 	// make sure there is at least something there.
 	// (perhaps this test should be for minimum length of a URL)
 	std::string url = mAddressCombo->getValue().asString();
+    LLStringUtil::trim(url);
 	if ( url.length() > 0 )
 	{
 		mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
@@ -461,6 +494,7 @@ void LLFloaterWebContent::onPopExternal()
 	// make sure there is at least something there.
 	// (perhaps this test should be for minimum length of a URL)
 	std::string url = mAddressCombo->getValue().asString();
+    LLStringUtil::trim(url);
 	if ( url.length() > 0 )
 	{
 		LLWeb::loadURLExternal( url );