diff options
author | McCabe Maxsted | 2011-10-17 21:29:59 -0700 |
---|---|---|
committer | McCabe Maxsted | 2011-10-17 21:29:59 -0700 |
commit | 7bb145ce6ed632555cc5a3a04a43a2529dbdd3fc (patch) | |
tree | 374bc94025c99b30bd1b8eba7c7dd7f81c8d8dc8 /linden/indra/newview/floatervoicelicense.cpp | |
parent | Fixed vivox license appearing when enabling voice on opensim (diff) | |
download | meta-impy-7bb145ce6ed632555cc5a3a04a43a2529dbdd3fc.zip meta-impy-7bb145ce6ed632555cc5a3a04a43a2529dbdd3fc.tar.gz meta-impy-7bb145ce6ed632555cc5a3a04a43a2529dbdd3fc.tar.bz2 meta-impy-7bb145ce6ed632555cc5a3a04a43a2529dbdd3fc.tar.xz |
Always enable the vivox license checkbox, as it sometimes doesn't enable when the license loads
Diffstat (limited to 'linden/indra/newview/floatervoicelicense.cpp')
-rw-r--r-- | linden/indra/newview/floatervoicelicense.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
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() | |||
114 | childSetAction("Cancel", onCancel, this); | 114 | childSetAction("Cancel", onCancel, this); |
115 | childSetCommitCallback("agree_chk", updateAgree, this); | 115 | childSetCommitCallback("agree_chk", updateAgree, this); |
116 | 116 | ||
117 | // disable Agree to License radio button until the page has fully loaded | ||
118 | LLCheckBoxCtrl* license_agreement = getChild<LLCheckBoxCtrl>("agree_chk"); | ||
119 | license_agreement->setEnabled( false ); | ||
120 | |||
121 | // hide the SL text widget if we're displaying license with using a browser widget. | 117 | // hide the SL text widget if we're displaying license with using a browser widget. |
122 | LLTextEditor *editor = getChild<LLTextEditor>("license_text"); | 118 | LLTextEditor *editor = getChild<LLTextEditor>("license_text"); |
123 | editor->setVisible( FALSE ); | 119 | editor->setVisible( FALSE ); |
@@ -159,8 +155,7 @@ void FloaterVoiceLicense::setSiteIsAlive( bool alive ) | |||
159 | { | 155 | { |
160 | // normally this is set when navigation to license page completes (so you can't accept before it loads) | 156 | // normally this is set when navigation to license page completes (so you can't accept before it loads) |
161 | // but if the page is unavailable, we need to do this now | 157 | // but if the page is unavailable, we need to do this now |
162 | LLCheckBoxCtrl* license_agreement = getChild<LLCheckBoxCtrl>("agree_chk"); | 158 | // We used to enable "agree_chk" checkbox here too -- MC |
163 | license_agreement->setEnabled( true ); | ||
164 | } | 159 | } |
165 | } | 160 | } |
166 | 161 | ||
@@ -234,9 +229,8 @@ void FloaterVoiceLicense::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaE | |||
234 | if ( ++mLoadCompleteCount == 2 ) | 229 | if ( ++mLoadCompleteCount == 2 ) |
235 | { | 230 | { |
236 | llinfos << "NAVIGATE COMPLETE" << llendl; | 231 | llinfos << "NAVIGATE COMPLETE" << llendl; |
237 | // enable Agree to License radio button now that page has loaded | 232 | // We used to enable Agree to License radio button now that page has loaded here |
238 | LLCheckBoxCtrl * license_agreement = getChild<LLCheckBoxCtrl>("agree_chk"); | 233 | // but this is event is horribly broken -- MC |
239 | license_agreement->setEnabled( true ); | ||
240 | } | 234 | } |
241 | } | 235 | } |
242 | } | 236 | } |