From 7bb145ce6ed632555cc5a3a04a43a2529dbdd3fc Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 17 Oct 2011 21:29:59 -0700 Subject: Always enable the vivox license checkbox, as it sometimes doesn't enable when the license loads --- linden/indra/newview/floatervoicelicense.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/floatervoicelicense.cpp b/linden/indra/newview/floatervoicelicense.cpp index c780ff3..b7814e7 100644 --- a/linden/indra/newview/floatervoicelicense.cpp +++ b/linden/indra/newview/floatervoicelicense.cpp @@ -114,10 +114,6 @@ BOOL FloaterVoiceLicense::postBuild() childSetAction("Cancel", onCancel, this); childSetCommitCallback("agree_chk", updateAgree, this); - // disable Agree to License radio button until the page has fully loaded - LLCheckBoxCtrl* license_agreement = getChild("agree_chk"); - license_agreement->setEnabled( false ); - // hide the SL text widget if we're displaying license with using a browser widget. LLTextEditor *editor = getChild("license_text"); editor->setVisible( FALSE ); @@ -159,8 +155,7 @@ void FloaterVoiceLicense::setSiteIsAlive( bool alive ) { // normally this is set when navigation to license page completes (so you can't accept before it loads) // but if the page is unavailable, we need to do this now - LLCheckBoxCtrl* license_agreement = getChild("agree_chk"); - license_agreement->setEnabled( true ); + // We used to enable "agree_chk" checkbox here too -- MC } } @@ -234,9 +229,8 @@ void FloaterVoiceLicense::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaE if ( ++mLoadCompleteCount == 2 ) { llinfos << "NAVIGATE COMPLETE" << llendl; - // enable Agree to License radio button now that page has loaded - LLCheckBoxCtrl * license_agreement = getChild("agree_chk"); - license_agreement->setEnabled( true ); + // We used to enable Agree to License radio button now that page has loaded here + // but this is event is horribly broken -- MC } } } -- cgit v1.1