diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp
index f9dde034513b93388dcaa63b7c4ec463229ce854..6a3617f008440f420b8a2ab223ed56ba006d1f6d 100644
--- a/indra/newview/llpanelmediasettingsgeneral.cpp
+++ b/indra/newview/llpanelmediasettingsgeneral.cpp
@@ -207,7 +207,7 @@ void LLPanelMediaSettingsGeneral::clearValues( void* userdata, bool editable)
 	self->mHeightPixels ->setEnabled(editable);
 	self->mHomeURL ->setEnabled(editable);
 	self->mWidthPixels ->setEnabled(editable);
-	self->mPreviewMedia->unloadMediaSource(); 
+	self->updateMediaPreview();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -312,10 +312,10 @@ void LLPanelMediaSettingsGeneral::updateMediaPreview()
 		mPreviewMedia->navigateTo( mHomeURL->getValue().asString() );
 	}
 	else
-	// new home URL will be empty if media is deleted but
-	// we still need to clean out the preview.
+	// new home URL will be empty if media is deleted so display a 
+	// "preview goes here" data url page
 	{
-		mPreviewMedia->unloadMediaSource();
+		mPreviewMedia->navigateTo( "data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%22100%%22 height=%22100%%22 %3E%3Cdefs%3E%3Cpattern id=%22checker%22 patternUnits=%22userSpaceOnUse%22 x=%220%22 y=%220%22 width=%22128%22 height=%22128%22 viewBox=%220 0 128 128%22 %3E%3Crect x=%220%22 y=%220%22 width=%2264%22 height=%2264%22 fill=%22#ddddff%22 /%3E%3Crect x=%2264%22 y=%2264%22 width=%2264%22 height=%2264%22 fill=%22#ddddff%22 /%3E%3C/pattern%3E%3C/defs%3E%3Crect x=%220%22 y=%220%22 width=%22100%%22 height=%22100%%22 fill=%22url(#checker)%22 /%3E%3C/svg%3E" );
 	};
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index f9e4b9e7c067186165aa373ede5665a08867619a..cc47e99c2cb9c6d80a22d4259b448e4cf07cf428 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -32,6 +32,27 @@
     <!--  <line_editor.commit_callback
 	     function="Media.CommitHomeURL"/> -->
   </line_editor>
+
+  <web_browser
+   border_visible="true"
+   bottom_delta="-133"
+   follows="top|left"
+   left="120"
+   name="preview_media"
+   width="128"
+   height="128"
+   start_url="about:blank"
+   decouple_texture_size="true" />
+  
+  <text
+   bottom_delta="-15"
+   follows="top|left"
+   height="15"
+   left="164"
+   name="">
+    Preview
+  </text>
+  
   <text 
    bottom_delta="-20" 
    follows="top|left" 
@@ -62,27 +83,6 @@
    <button.commit_callback
 	     function="Media.ResetCurrentUrl"/>
   </button>
-
-  <web_browser 
-   border_visible="false" 
-   bottom_delta="-133" 
-   follows="top|left"
-   left="120" 
-   name="preview_media" 
-   width="128" 
-   height="128" 
-   start_url="about:blank" 
-   decouple_texture_size="true" />
-
-  <text 
-   bottom_delta="-15" 
-   follows="top|left" 
-   height="15" 
-   left="164" 
-   name="">
-    Preview
-  </text>
-
   <text 
    bottom_delta="-5" 
    follows="top|left" 
diff --git a/indra/test_apps/llplugintest/bookmarks.txt b/indra/test_apps/llplugintest/bookmarks.txt
index e5268fcac90df64d5ac5209e248123dc978a42b9..ef34167b2985fa9cbd89a6a0dcfce036e05ea0b7 100644
--- a/indra/test_apps/llplugintest/bookmarks.txt
+++ b/indra/test_apps/llplugintest/bookmarks.txt
@@ -8,6 +8,7 @@
 (WK) Canvas Paint (DHTML version of MS Paint),http://www.canvaspaint.org
 (WK) DHTML Lemmings!,http://www.elizium.nu/scripts/lemmings/
 (WK) DHTML graphics demos,http://www.dhteumeuleu.com/
+(WK) Shared paint app,http://colorillo.com/ac79?1l0q6cp
 (Flash) YouTube,http://youtube.com
 (Flash) Vimeo,http://www.vimeo.com/1778399
 (Flash) Simple whiteboard,http://www.imaginationcubed.com/
diff --git a/install.xml b/install.xml
index 2ab458d88b2b855202d951883432bd94abd29195..2f04d1c43757a9fa13c1d1dc13cf3d09bdbc8068 100644
--- a/install.xml
+++ b/install.xml
@@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>6c6282025d1b8cd9e70c0f858a14fdca</string>
+            <string>6f2f911545e5906edc87f4f3cda423a1</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-20091001.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-20091023.tar.bz2</uri>
           </map>
         </map>
       </map>