Fully combine voice with tos stuffs

Removes separate voice license code
Cleans up tos code
This commit is contained in:
Lirusaito
2019-07-02 14:00:12 -04:00
parent 65df86e741
commit 658be9bd58
8 changed files with 88 additions and 421 deletions

View File

@@ -45,8 +45,8 @@
#include "llviewercontrol.h"
#include "llui.h"
#include "llappviewer.h"
#include "llfloatertos.h"
#include "lltracker.h"
#include "floatervoicelicense.h"
#include "llstartup.h"
#include "hippogridmanager.h"
@@ -303,8 +303,9 @@ void LLFirstUse::voiceLicenseAgreement()
{
gSavedSettings.setWarning("FirstVoiceLicense", FALSE);
FloaterVoiceLicense::getInstance()->open();
FloaterVoiceLicense::getInstance()->center();
auto inst = LLFloaterTOS::show(LLFloaterTOS::TOS_VOICE);
inst->open();
inst->center();
}
else // currently in STATE_LOGIN_VOICE_LICENSE when arriving here
{