Second Life viewer sources 1.19.1.0

1 files changed, 5 insertions, 22 deletions

diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index fd069c9..c64173e 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -145,7 +145,6 @@ BOOL LLFloaterTOS::postBuild()
                 return TRUE;
         }
 
-#if LL_LIBXUL_ENABLED
         // disable Agree to TOS radio button until the page has fully loaded
         LLRadioGroup* tos_agreement = LLUICtrlFactory::getRadioGroupByName(this, "tos_agreement");
         if ( tos_agreement )
@@ -160,7 +159,7 @@ BOOL LLFloaterTOS::postBuild()
                 editor->setVisible( FALSE );
         };
 
-        LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "tos_html");
+        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
         if ( web_browser )
         {
                 // start to observe it so we see navigate complete events
@@ -170,20 +169,8 @@ BOOL LLFloaterTOS::postBuild()
                 };
 
                 gResponsePtr = LLIamHere::build( this );
-                LLHTTPClient::get( childGetValue( "real_url" ).asString(), gResponsePtr );
+                LLHTTPClient::get( getString( "real_url" ), gResponsePtr );
         };
-#else
-        LLTextEditor *Editor = LLUICtrlFactory::getTextEditorByName(this, "tos_text");
-        if (Editor)
-        {
-                Editor->setHandleEditKeysDirectly( TRUE );
-                Editor->setEnabled( FALSE );
-                Editor->setReadOnlyFgColor(LLColor4::white);
-                Editor->setWordWrap(TRUE);
-                Editor->setFocus(TRUE);
-        }
-        childSetValue("tos_text", LLSD(mMessage));      
-#endif
 
         return TRUE;
 }
@@ -193,15 +180,14 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
         // only do this for TOS pages
         if ( mType == TOS_TOS )
         {
-#if LL_LIBXUL_ENABLED
-                LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "tos_html");
+                LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
                 // if the contents of the site was retrieved
                 if ( alive )
                 {
                         if ( web_browser )
                         {
                                 // navigate to the "real" page 
-                                web_browser->navigateTo( childGetValue( "real_url" ).asString() );
+                                web_browser->navigateTo( getString( "real_url" ) );
                         };
                 }
                 else
@@ -220,20 +206,17 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
                                 web_browser->setVisible( FALSE );
                         };
                 };
-#endif // LL_LIBXUL_ENABLED
         };
 }
 
 LLFloaterTOS::~LLFloaterTOS()
 {
-#if LL_LIBXUL_ENABLED
         // stop obsaerving events
-        LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "tos_html");
+        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
         if ( web_browser )
         {
                 web_browser->addObserver( this );               
         };
-#endif // LL_LIBXUL_ENABLED
 
         // tell the responder we're not here anymore
         if ( gResponsePtr )