1 files changed, 12 insertions, 15 deletions

diff --git a/linden/indra/newview/floatervoicelicense.cpp b/linden/indra/newview/floatervoicelicense.cpp
index 840a9e6..e8cd4f3 100644
--- a/linden/indra/newview/floatervoicelicense.cpp
+++ b/linden/indra/newview/floatervoicelicense.cpp
@@ -122,7 +122,7 @@ BOOL FloaterVoiceLicense::postBuild()
         LLTextEditor *editor = getChild<LLTextEditor>("license_text");
         editor->setVisible( FALSE );
 
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("license_html");
+        LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("license_html");
         if ( web_browser )
         {
                 // start to observe it so we see navigate complete events
@@ -137,7 +137,7 @@ BOOL FloaterVoiceLicense::postBuild()
 
 void FloaterVoiceLicense::setSiteIsAlive( bool alive )
 {
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("license_html");
+        LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("license_html");
         // if the contents of the site was retrieved
         if ( alive )
         {
@@ -158,12 +158,6 @@ void FloaterVoiceLicense::setSiteIsAlive( bool alive )
 
 FloaterVoiceLicense::~FloaterVoiceLicense()
 {
-        // stop observing events
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("license_html");
-        if ( web_browser )
-        {
-                web_browser->remObserver( this );               
-        }
 
         // tell the responder we're not here anymore
         if ( gResponsePtr )
@@ -224,14 +218,17 @@ void FloaterVoiceLicense::onCancel( void* userdata )
 }
 
 //virtual 
-void FloaterVoiceLicense::onNavigateComplete( const EventType& eventIn )
+void FloaterVoiceLicense::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent event)
 {
-        // skip past the loading screen navigate complete
-        if ( ++mLoadCompleteCount == 2 )
+        if(event == MEDIA_EVENT_NAVIGATE_COMPLETE)
         {
-                llinfos << "NAVIGATE COMPLETE" << llendl;
-                // enable Agree to License radio button now that page has loaded
-                LLCheckBoxCtrl * license_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-                license_agreement->setEnabled( true );
+                // skip past the loading screen navigate complete
+                if ( ++mLoadCompleteCount == 2 )
+                {
+                        llinfos << "NAVIGATE COMPLETE" << llendl;
+                        // enable Agree to License radio button now that page has loaded
+                        LLCheckBoxCtrl * license_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
+                        license_agreement->setEnabled( true );
+                }
         }
 }