Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/floatervoicelicense.cpp
View File

@@ -195,7 +195,7 @@ void FloaterVoiceLicense::updateAgree(LLUICtrl*, void* userdata )
void FloaterVoiceLicense::onContinue( void* userdata )
{
FloaterVoiceLicense* self = (FloaterVoiceLicense*) userdata;
llinfos << "User agreed to the Vivox personal license" << llendl;
LL_INFOS() << "User agreed to the Vivox personal license" << LL_ENDL;
// enabling voice by default here seems like the best behavior
gSavedSettings.setBOOL("EnableVoiceChat", TRUE);
@@ -215,7 +215,7 @@ void FloaterVoiceLicense::onContinue( void* userdata )
void FloaterVoiceLicense::onCancel( void* userdata )
{
FloaterVoiceLicense* self = (FloaterVoiceLicense*) userdata;
llinfos << "User disagreed with the vivox personal license" << llendl;
LL_INFOS() << "User disagreed with the vivox personal license" << LL_ENDL;
gSavedSettings.setBOOL("EnableVoiceChat", FALSE);
gSavedSettings.setBOOL("VivoxLicenseAccepted", FALSE);
@@ -235,7 +235,7 @@ void FloaterVoiceLicense::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaE
// skip past the loading screen navigate complete
if ( ++mLoadCompleteCount == 2 )
{
llinfos << "NAVIGATE COMPLETE" << llendl;
LL_INFOS() << "NAVIGATE COMPLETE" << LL_ENDL;
// enable Agree to License radio button now that page has loaded
LLCheckBoxCtrl * license_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
license_agreement->setEnabled( true );