1 files changed, 14 insertions, 19 deletions

diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index 6a392e0..2dedc79 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -161,12 +161,10 @@ BOOL LLFloaterTOS::postBuild()
         LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
         editor->setVisible( FALSE );
 
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
+        LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");
         if ( web_browser )
         {
-                // start to observe it so we see navigate complete events
-                web_browser->addObserver( this );
-
+                web_browser->addObserver(this);
                 gResponsePtr = LLIamHere::build( this );
                 LLHTTPClient::get( getString( "real_url" ), gResponsePtr );
         }
@@ -179,7 +177,7 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
         // only do this for TOS pages
         if ( mType == TOS_TOS )
         {
-                LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
+                LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");
                 // if the contents of the site was retrieved
                 if ( alive )
                 {
@@ -201,12 +199,6 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
 
 LLFloaterTOS::~LLFloaterTOS()
 {
-        // stop obsaerving events
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
-        if ( web_browser )
-        {
-                web_browser->remObserver( this );               
-        };
 
         // tell the responder we're not here anymore
         if ( gResponsePtr )
@@ -269,14 +261,17 @@ void LLFloaterTOS::onCancel( void* userdata )
 }
 
 //virtual 
-void LLFloaterTOS::onNavigateComplete( const EventType& eventIn )
+void LLFloaterTOS::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 TOS radio button now that page has loaded
-                LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-                tos_agreement->setEnabled( true );
-        };
+                // skip past the loading screen navigate complete
+                if ( ++mLoadCompleteCount == 2 )
+                {
+                        llinfos << "NAVIGATE COMPLETE" << llendl;
+                        // enable Agree to TOS radio button now that page has loaded
+                        LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
+                        tos_agreement->setEnabled( true );
+                }
+        }
 }