Skip to content
Snippets Groups Projects
Commit 179b434d authored by callum's avatar callum
Browse files

SOCIAL-389 FIX Stop button in Web Content panel does not stop page content...

SOCIAL-389 FIX Stop button in Web Content panel does not stop page content from loading or progress bar
So many things wrong here it wasn't funny - button not enabled, button not connected to function, wrong call to stop browser etc.
parent 27708009
No related branches found
No related tags found
No related merge requests found
...@@ -45,6 +45,7 @@ LLFloaterWebContent::LLFloaterWebContent( const LLSD& key ) ...@@ -45,6 +45,7 @@ LLFloaterWebContent::LLFloaterWebContent( const LLSD& key )
mCommitCallbackRegistrar.add( "WebContent.Back", boost::bind( &LLFloaterWebContent::onClickBack, this )); mCommitCallbackRegistrar.add( "WebContent.Back", boost::bind( &LLFloaterWebContent::onClickBack, this ));
mCommitCallbackRegistrar.add( "WebContent.Forward", boost::bind( &LLFloaterWebContent::onClickForward, this )); mCommitCallbackRegistrar.add( "WebContent.Forward", boost::bind( &LLFloaterWebContent::onClickForward, this ));
mCommitCallbackRegistrar.add( "WebContent.Reload", boost::bind( &LLFloaterWebContent::onClickReload, this )); mCommitCallbackRegistrar.add( "WebContent.Reload", boost::bind( &LLFloaterWebContent::onClickReload, this ));
mCommitCallbackRegistrar.add( "WebContent.Stop", boost::bind( &LLFloaterWebContent::onClickStop, this ));
mCommitCallbackRegistrar.add( "WebContent.EnterAddress", boost::bind( &LLFloaterWebContent::onEnterAddress, this )); mCommitCallbackRegistrar.add( "WebContent.EnterAddress", boost::bind( &LLFloaterWebContent::onEnterAddress, this ));
mCommitCallbackRegistrar.add( "WebContent.PopExternal", boost::bind( &LLFloaterWebContent::onPopExternal, this )); mCommitCallbackRegistrar.add( "WebContent.PopExternal", boost::bind( &LLFloaterWebContent::onPopExternal, this ));
} }
...@@ -338,7 +339,13 @@ void LLFloaterWebContent::onClickReload() ...@@ -338,7 +339,13 @@ void LLFloaterWebContent::onClickReload()
void LLFloaterWebContent::onClickStop() void LLFloaterWebContent::onClickStop()
{ {
if( mWebBrowser->getMediaPlugin() ) if( mWebBrowser->getMediaPlugin() )
mWebBrowser->getMediaPlugin()->stop(); mWebBrowser->getMediaPlugin()->browse_stop();
// still should happen when we catch the navigate complete event
// but sometimes (don't know why) that event isn't sent from Qt
// and we getto a point where the stop button stays active.
getChildView("reload")->setVisible( true );
getChildView("stop")->setVisible( false );
} }
void LLFloaterWebContent::onEnterAddress() void LLFloaterWebContent::onEnterAddress()
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
image_selected="PushButton_Selected" image_selected="PushButton_Selected"
image_unselected="PushButton_Off" image_unselected="PushButton_Off"
tool_tip="Stop navigation" tool_tip="Stop navigation"
enabled="false" enabled="true"
follows="left|top" follows="left|top"
height="22" height="22"
layout="topleft" layout="topleft"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment