diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-14 17:53:04 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-14 17:53:04 -0800 |
| commit | 7b963a5ec0b15712caba706fd62cb912a2b4fb33 (patch) | |
| tree | 0fa2976da3b96132d141708178dafa75259bef09 /indra/newview/llfloaterwebcontent.cpp | |
| parent | 7c5d96f91efc7146b8cf6471cbc4c1dda50b9a93 (diff) | |
SOCIAL-369 FIX Hitting reload on the media browser removes entries from location history for that session in Webkit 4.7
Diffstat (limited to 'indra/newview/llfloaterwebcontent.cpp')
| -rw-r--r-- | indra/newview/llfloaterwebcontent.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 4d7c80ad6c..a244c8d281 100644 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -306,13 +306,9 @@ void LLFloaterWebContent::set_current_url(const std::string& url) {
mCurrentURL = url;
- // redirects will navigate momentarily to about:blank, don't add to history
- if ( mCurrentURL != "about:blank" )
- {
- mAddressCombo->remove( mCurrentURL );
- mAddressCombo->add( mCurrentURL );
- mAddressCombo->selectByValue( mCurrentURL );
- }
+ mAddressCombo->remove( mCurrentURL );
+ mAddressCombo->add( mCurrentURL );
+ mAddressCombo->selectByValue( mCurrentURL );
}
void LLFloaterWebContent::onClickForward()
@@ -327,13 +323,16 @@ void LLFloaterWebContent::onClickBack() void LLFloaterWebContent::onClickReload()
{
- mAddressCombo->remove(0);
if( mWebBrowser->getMediaPlugin() )
{
bool ignore_cache = true;
mWebBrowser->getMediaPlugin()->browse_reload( ignore_cache );
- };
+ }
+ else
+ {
+ mWebBrowser->navigateTo(mCurrentURL);
+ }
}
void LLFloaterWebContent::onClickStop()
|