Fix for EXP-78 (javascript window.open function with no size parameters opens a tiny window when all popups setting is enabled).

1 files changed, 17 insertions, 13 deletions

diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 67f49556c5..bd1a44a930 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -549,21 +549,25 @@ private:
 		int x, y, width, height;
 		event.getRectValue(x, y, width, height);
 
-		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "geometry_change");
-		message.setValue("uuid", event.getStringValue());
-		message.setValueS32("x", x);
-		message.setValueS32("y", y);
-		message.setValueS32("width", width);
-		message.setValueS32("height", height);
-		sendMessage(message);
+		// This sometimes gets called with a zero-size request.  Don't pass these along.
+		if(width > 0 && height > 0)
+		{
+			LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "geometry_change");
+			message.setValue("uuid", event.getStringValue());
+			message.setValueS32("x", x);
+			message.setValueS32("y", y);
+			message.setValueS32("width", width);
+			message.setValueS32("height", height);
+			sendMessage(message);
+		}
 	}
 
-	////////////////////////////////////////////////////////////////////////////////

-	// virtual

-	std::string onRequestFilePicker( const EventType& eventIn )

-	{

-		return blockingPickFile();

-	}

+	////////////////////////////////////////////////////////////////////////////////
+	// virtual
+	std::string onRequestFilePicker( const EventType& eventIn )
+	{
+		return blockingPickFile();
+	}
 	
 	LLQtWebKit::EKeyboardModifier decodeModifiers(std::string &modifiers)
 	{