1 files changed, 8 insertions, 13 deletions

diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index 2684e10..f3a124a 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -151,7 +151,7 @@ BOOL LLFloaterTOS::postBuild()
         editor->setWordWrap(TRUE);

         editor->setFocus(TRUE);

         editor->setValue(LLSD(mMessage));

-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");

+        LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");

         if (web_browser)

         {

                 //Disable for critical messages and text messages, it is reenabled later

@@ -192,9 +192,7 @@ BOOL LLFloaterTOS::postBuild()
                 // Reenable the web browser

                 web_browser->setVisible( TRUE );

 

-                // start to observe it so we see navigate complete events

-                web_browser->addObserver( this );

-

+                web_browser->addObserver(this);

                 gResponsePtr = LLIamHereTOS::build( this );

                 LLHTTPClient::head( getString( "real_url" ), gResponsePtr );

         }

@@ -207,7 +205,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 )

                 {

@@ -229,12 +227,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 )

@@ -297,8 +289,10 @@ void LLFloaterTOS::onCancel( void* userdata )
 }

 

 //virtual 

-void LLFloaterTOS::onNavigateComplete( const EventType& eventIn )

+void LLFloaterTOS::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent event)

 {

+        if(event == MEDIA_EVENT_NAVIGATE_COMPLETE)

+        {

         // skip past the loading screen navigate complete

         if ( ++mLoadCompleteCount == 2 )

         {

@@ -306,5 +300,6 @@ void LLFloaterTOS::onNavigateComplete( const EventType& eventIn )
                 // enable Agree to TOS radio button now that page has loaded

                 LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");

                 tos_agreement->setEnabled( true );

-        };

+                }

+        }

 }