Now we're Vivox license compliant

This commit is contained in:
Siana Gearz
2011-01-07 17:07:00 +01:00
parent 16b6ebf7de
commit 7805feb08f
11 changed files with 602 additions and 4 deletions

View File

@@ -44,6 +44,8 @@
#include "llui.h"
#include "llappviewer.h"
#include "lltracker.h"
#include "floatervoicelicense.h"
#include "llstartup.h"
// static
std::set<std::string> LLFirstUse::sConfigVariables;
@@ -277,3 +279,19 @@ void LLFirstUse::useMedia()
LLNotifications::instance().add("FirstMedia");
}
}
// static
void LLFirstUse::voiceLicenseAgreement()
{
if (gSavedSettings.getWarning("FirstVoiceLicense"))
{
gSavedSettings.setWarning("FirstVoiceLicense", FALSE);
FloaterVoiceLicense::getInstance()->open();
FloaterVoiceLicense::getInstance()->center();
}
else // currently in STATE_LOGIN_VOICE_LICENSE when arriving here
{
LLStartUp::setStartupState(STATE_LOGIN_AUTH_INIT);
}
}