1 files changed, 24 insertions, 18 deletions

diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 609f5cc..14c4a90 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -50,6 +50,7 @@
 #include "llviewercontrol.h"
 #include "llmenucommands.h"
 #include "llmenugl.h"
+#include "llpluginclassmedia.h"
 #include "lltextbox.h"
 #include "lluiconstants.h"
 #include "llviewerimagelist.h"
@@ -143,9 +144,11 @@ BOOL LLPanelDirFind::postBuild()
         }
         
         
-        mWebBrowser = getChild<LLWebBrowserCtrl>(mBrowserName);
+        mWebBrowser = getChild<LLMediaCtrl>(mBrowserName);
         if (mWebBrowser)
         {
+                mWebBrowser->addObserver(this);
+                
                 // new pages appear in same window as the results page now
                 mWebBrowser->setOpenInInternalBrowser( false );
                 mWebBrowser->setOpenInExternalBrowser( false ); 
@@ -156,9 +159,6 @@ BOOL LLPanelDirFind::postBuild()
                 // redirect 404 pages from S3 somewhere else
                 mWebBrowser->set404RedirectUrl( getString("redirect_404_url") );
 
-                // Track updates for progress display.
-                mWebBrowser->addObserver(this);
-
                 navigateToDefaultPage();
         }
 
@@ -167,8 +167,6 @@ BOOL LLPanelDirFind::postBuild()
 
 LLPanelDirFind::~LLPanelDirFind()
 {
-        if (mWebBrowser) 
-                mWebBrowser->remObserver(this);
 }
 
 // virtual
@@ -485,19 +483,27 @@ void LLPanelDirFind::onClickSearch(void* data)
         LLFloaterDirectory::sNewSearchCount++;
 }
 
-void LLPanelDirFind::onNavigateBegin( const EventType& eventIn )
-{
-        childSetText("status_text", getString("loading_text"));
-}
-
-void LLPanelDirFind::onNavigateComplete( const EventType& eventIn )
+void LLPanelDirFind::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 {
-        childSetText("status_text", getString("done_text"));
-}
-
-void LLPanelDirFind::onLocationChange( const EventType& eventIn )
-{
-        llinfos << eventIn.getStringValue() << llendl;
+        switch(event)
+        {
+                case MEDIA_EVENT_NAVIGATE_BEGIN:
+                        childSetText("status_text", getString("loading_text"));
+                break;
+                
+                case MEDIA_EVENT_NAVIGATE_COMPLETE:
+                        childSetText("status_text", getString("done_text"));
+                break;
+                
+                case MEDIA_EVENT_LOCATION_CHANGED:
+                        // Debugging info to console
+                        llinfos << self->getLocation() << llendl;
+                break;
+
+                default:
+                        // Having a default case makes the compiler happy.
+                break;
+        }
 }
 
 //---------------------------------------------------------------------------