FIRE-14935; If the state of the plugin roo fast, the correct URI to load was never set. Make sure we're toggling the URI if needed even when past INIT_STATE_NAVIGATE_COMPLETE. Firestorm_4.6.9

Sun, 30 Nov 2014 01:50:24 +0100

author
Nicky
date
Sun, 30 Nov 2014 01:50:24 +0100
branch
Firestorm_4.6.9
changeset 43022
6744cf22c5d2
parent 43021
dbf5fb55b0cb
child 43061
4e925b1eb178

FIRE-14935; If the state of the plugin roo fast, the correct URI to load was never set. Make sure we're toggling the URI if needed even when past INIT_STATE_NAVIGATE_COMPLETE.

indra/media_plugins/webkit/media_plugin_webkit.cpp file | annotate | diff | revisions
     1.1 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp	Sat Nov 22 03:56:28 2014 +0100
     1.2 +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp	Sun Nov 30 01:50:24 2014 +0100
     1.3 @@ -160,7 +160,10 @@
     1.4  
     1.5  		checkEditState();
     1.6  		
     1.7 -		if(mInitState == INIT_STATE_NAVIGATE_COMPLETE)
     1.8 +		// <FS:ND> FIRE-14935; Make sure to load URI even if state changes are happing rapidly
     1.9 +		// if(mInitState == INIT_STATE_NAVIGATE_COMPLETE)
    1.10 +		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
    1.11 +		// </FS:ND>
    1.12  		{
    1.13  			if(!mInitialNavigateURL.empty())
    1.14  			{
    1.15 @@ -458,7 +461,10 @@
    1.16  	// virtual
    1.17  	void onNavigateBegin(const EventType& event)
    1.18  	{
    1.19 -		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
    1.20 +		// <FS:ND> FIRE-14935; Do not switch URI if there is still a saved URI to load
    1.21 +		// if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
    1.22 +		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE && mInitialNavigateURL.empty() )
    1.23 +		// </FS:ND>
    1.24  		{
    1.25  			LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_begin");
    1.26  			message.setValue("uri", event.getEventUri());

mercurial