SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be useful for viewer web apps

Added support for graphic browser buttons and laid them out differently

1 files changed, 4 insertions, 9 deletions

diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 8321b2914f..8e5638f549 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -45,7 +45,6 @@ LLFloaterWebContent::LLFloaterWebContent(const LLSD& key)
 	mCommitCallbackRegistrar.add("WebContent.Reload", boost::bind( &LLFloaterWebContent::onClickReload, this));

 

 	mCommitCallbackRegistrar.add("WebContent.EnterAddress", boost::bind( &LLFloaterWebContent::onEnterAddress, this));

-	mCommitCallbackRegistrar.add("WebContent.Go", boost::bind( &LLFloaterWebContent::onClickGo, this));

 }

 

 BOOL LLFloaterWebContent::postBuild()

@@ -61,7 +60,6 @@ BOOL LLFloaterWebContent::postBuild()
 

 	// these button are always enabled

 	getChildView("reload")->setEnabled( true );

-	getChildView("go")->setEnabled( true );

 

 	return TRUE;

 }

@@ -214,7 +212,8 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
 		getChildView("forward")->setEnabled( self->getHistoryForwardAvailable() );

 

 		// manually decide on the state of this button

-		getChildView("stop")->setEnabled( true );

+		getChildView("reload")->setVisible( false );

+		getChildView("stop")->setVisible( true );

 

 		// turn "on" progress bar now we're loaded

 		mStatusBarProgress->setVisible( true );

@@ -226,7 +225,8 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
 		getChildView("forward")->setEnabled( self->getHistoryForwardAvailable() );

 

 		// manually decide on the state of this button

-		getChildView("stop")->setEnabled( false );

+		getChildView("reload")->setVisible( true );

+		getChildView("stop")->setVisible( false );

 

 		// turn "off" progress bar now we're loaded

 		mStatusBarProgress->setVisible( false );

@@ -302,8 +302,3 @@ void LLFloaterWebContent::onEnterAddress()
 {

 	mWebBrowser->navigateTo( mAddressCombo->getValue().asString() );

 }

-

-void LLFloaterWebContent::onClickGo()

-{

-	mWebBrowser->navigateTo( mAddressCombo->getValue().asString() );

-}