Merged webkit_plugins into weekly. Huzzah! The weekly branch now has browser/media plugin support

1 files changed, 9 insertions, 1 deletions

diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index bebd69e..11f491c 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -358,13 +358,21 @@ void LLPanelLandMedia::setMediaType(const std::string& mime_type)
 
         std::string media_key = LLMIMETypes::widgetType(mime_type);
         mMediaTypeCombo->setValue(media_key);
+
         childSetText("mime_type", mime_type);
 }
 
 void LLPanelLandMedia::setMediaURL(const std::string& media_url)
 {
         mMediaURLEdit->setText(media_url);
+        LLParcel *parcel = mParcel->getParcel();
+        if(parcel)
+                parcel->setMediaCurrentURL(media_url);
+        // LLViewerMedia::navigateHome();
+
         mMediaURLEdit->onCommit();
+//      // LLViewerParcelMedia::sendMediaNavigateMessage(media_url);
+//      childSetText("current_url", media_url);
 }
 
 std::string LLPanelLandMedia::getMediaURL()
@@ -452,4 +460,4 @@ void LLPanelLandMedia::onSetBtn(void *userdata)
         {
                 parent_floater->addDependentFloater(self->mURLEntryFloater.get());
         }
-}
+}
\ No newline at end of file