diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
| commit | 98fd90ddd6595f2ee7e626c14117f51def621ec5 (patch) | |
| tree | 9a9caf8bffa53b753fe850f445bd133195e9bb03 /indra/newview/llfloatertos.cpp | |
| parent | 89d938efe371645756240da72f4c359c36985060 (diff) | |
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it.
Diffstat (limited to 'indra/newview/llfloatertos.cpp')
| -rw-r--r-- | indra/newview/llfloatertos.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp index 20f9e1ecd4..bdf583126f 100644 --- a/indra/newview/llfloatertos.cpp +++ b/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 ) @@ -172,18 +171,6 @@ BOOL LLFloaterTOS::postBuild() gResponsePtr = LLIamHere::build( this ); LLHTTPClient::get( childGetValue( "real_url" ).asString(), 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,7 +180,6 @@ 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"); // if the contents of the site was retrieved if ( alive ) @@ -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"); if ( web_browser ) { web_browser->addObserver( this ); }; -#endif // LL_LIBXUL_ENABLED // tell the responder we're not here anymore if ( gResponsePtr ) |