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

1 files changed, 7 insertions, 7 deletions

diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 98a5d8f..d2d9ed5 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -81,7 +81,7 @@
 #include "llviewertexteditor.h"
 #include "llviewerwindow.h"
 #include "lluictrlfactory.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 #include "lluictrlfactory.h"
 
 #include "llviewercontrol.h"
@@ -363,7 +363,7 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
         // update back and forward buttons
         LLButton* fwd_button = help_floater->getChild<LLButton>("fwd_btn");
         LLButton* back_button = help_floater->getChild<LLButton>("back_btn");
-        LLWebBrowserCtrl* browser = help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+        LLMediaCtrl* browser = help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
         back_button->setEnabled(browser->canNavigateBack());
         fwd_button->setEnabled(browser->canNavigateForward());
 
@@ -422,7 +422,7 @@ void LLScriptEdCore::setHelpPage(const std::string& help_string)
         LLFloater* help_floater = mLiveHelpHandle.get();
         if (!help_floater) return;
         
-        LLWebBrowserCtrl* web_browser = help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+        LLMediaCtrl* web_browser = help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
         if (!web_browser) return;
 
         LLComboBox* history_combo = help_floater->getChild<LLComboBox>("history_combo");
@@ -595,7 +595,7 @@ void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
         live_help_floater->childSetAction("back_btn", onClickBack, userdata);
         live_help_floater->childSetAction("fwd_btn", onClickForward, userdata);
 
-        LLWebBrowserCtrl* browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+        LLMediaCtrl* browser = live_help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
         browser->setAlwaysRefresh(TRUE);
 
         LLComboBox* help_combo = live_help_floater->getChild<LLComboBox>("history_combo");
@@ -624,7 +624,7 @@ void LLScriptEdCore::onClickBack(void* userdata)
         LLFloater* live_help_floater = corep->mLiveHelpHandle.get();
         if (live_help_floater)
         {
-                LLWebBrowserCtrl* browserp = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+                LLMediaCtrl* browserp = live_help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
                 if (browserp)
                 {
                         browserp->navigateBack();
@@ -639,7 +639,7 @@ void LLScriptEdCore::onClickForward(void* userdata)
         LLFloater* live_help_floater = corep->mLiveHelpHandle.get();
         if (live_help_floater)
         {
-                LLWebBrowserCtrl* browserp = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+                LLMediaCtrl* browserp = live_help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
                 if (browserp)
                 {
                         browserp->navigateForward();
@@ -681,7 +681,7 @@ void LLScriptEdCore::onHelpComboCommit(LLUICtrl* ctrl, void* userdata)
 
                 corep->addHelpItemToHistory(help_string);
 
-                LLWebBrowserCtrl* web_browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+                LLMediaCtrl* web_browser = live_help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
                 LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
                 url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
                 url_string.setArg("[LSL_STRING]", help_string);