From d13953212bdca54d213312a076f5d65ebf0d5426 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 1 Aug 2010 22:33:02 -0700 Subject: Added first use grid selector for selecting the default grid when Imprudence is first run --- linden/indra/newview/llfirstuse.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'linden/indra/newview/llfirstuse.cpp') diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp index 34e3fcc..c0f07e5 100644 --- a/linden/indra/newview/llfirstuse.cpp +++ b/linden/indra/newview/llfirstuse.cpp @@ -46,6 +46,7 @@ #include "lltracker.h" #include "llvoavatar.h" +#include "floatergriddefault.h" #include "hippoGridManager.h" // [RLVa:KB] - Version: 1.22.11 @@ -308,6 +309,7 @@ void LLFirstUse::useMedia() LLNotifications::instance().add("FirstMedia"); } } + void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& response) { gSavedSettings.setWarning("ClientTags", FALSE); @@ -331,6 +333,7 @@ void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& respon gSavedSettings.setBOOL("DownloadClientTags",FALSE); } } + // static void LLFirstUse::ClientTags() { @@ -340,3 +343,14 @@ void LLFirstUse::ClientTags() } } +// static +void LLFirstUse::useLoginScreen() +{ + if (gSavedSettings.getWarning("FirstLoginScreen")) + { + gSavedSettings.setWarning("FirstLoginScreen", FALSE); + + FloaterGridDefault::getInstance()->open(); + FloaterGridDefault::getInstance()->center(); + } +} -- cgit v1.1 From 9302b9658ee8a2bc8547d5131faed42b6efa5575 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 19 Aug 2010 10:54:12 -0700 Subject: Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e --- linden/indra/newview/llfirstuse.cpp | 41 +++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) (limited to 'linden/indra/newview/llfirstuse.cpp') diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp index c0f07e5..886bb94 100644 --- a/linden/indra/newview/llfirstuse.cpp +++ b/linden/indra/newview/llfirstuse.cpp @@ -49,10 +49,6 @@ #include "floatergriddefault.h" #include "hippoGridManager.h" -// [RLVa:KB] - Version: 1.22.11 -#include "llviewerwindow.h" -// [/RLVa:KB] - // static std::set LLFirstUse::sConfigVariables; @@ -310,6 +306,43 @@ void LLFirstUse::useMedia() } } +// [RLVa:KB] - Version: 1.23.4 | Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a + +bool rlvHasVisibleFirstUseNotification() +{ + LLNotificationChannelPtr activeNotifications = LLNotifications::instance().getChannel("Notifications"); + for (LLNotificationChannel::Iterator itNotif = activeNotifications->begin(); itNotif != activeNotifications->end(); itNotif++) + if ((*itNotif)->getName().find(RLV_SETTING_FIRSTUSE_PREFIX) == 0) + return true; + return false; +} + +void LLFirstUse::showRlvFirstUseNotification(const std::string& strName) +{ + if ( (gSavedSettings.getWarning(strName)) && (!rlvHasVisibleFirstUseNotification()) ) + { + gSavedSettings.setWarning(strName, FALSE); + LLNotifications::instance().add(strName); + } +} + +void LLFirstUse::warnRlvGiveToRLV() +{ + if ( (gSavedSettings.getWarning(RLV_SETTING_FIRSTUSE_GIVETORLV)) && (RlvSettings::getForbidGiveToRLV()) ) + LLNotifications::instance().add(RLV_SETTING_FIRSTUSE_GIVETORLV, LLSD(), LLSD(), &LLFirstUse::onRlvGiveToRLVConfirmation); +} + +void LLFirstUse::onRlvGiveToRLVConfirmation(const LLSD& notification, const LLSD& response) +{ + gSavedSettings.setWarning(RLV_SETTING_FIRSTUSE_GIVETORLV, FALSE); + + S32 idxOption = LLNotification::getSelectedOption(notification, response); + if ( (0 == idxOption) || (1 == idxOption) ) + gSavedSettings.setBOOL(RLV_SETTING_FORBIDGIVETORLV, (idxOption == 1)); +} + +// [/RLVa:KB] + void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& response) { gSavedSettings.setWarning("ClientTags", FALSE); -- cgit v1.1 From ab2e1158c7d606fd6382f24eaba98ab761296c43 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 23 Aug 2010 21:07:05 -0700 Subject: Added vivox license window when enabling voice or starting up for the first time (voice can now be included from here on out :) --- linden/indra/newview/llfirstuse.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'linden/indra/newview/llfirstuse.cpp') diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp index 886bb94..e82aa96 100644 --- a/linden/indra/newview/llfirstuse.cpp +++ b/linden/indra/newview/llfirstuse.cpp @@ -45,9 +45,11 @@ #include "llappviewer.h" #include "lltracker.h" -#include "llvoavatar.h" #include "floatergriddefault.h" +#include "floatervoicelicense.h" #include "hippoGridManager.h" +#include "llstartup.h" +#include "llvoavatar.h" // static std::set LLFirstUse::sConfigVariables; @@ -387,3 +389,19 @@ void LLFirstUse::useLoginScreen() FloaterGridDefault::getInstance()->center(); } } + +// 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); + } +} -- cgit v1.1 From 1866bc2af39189c17b636970d4df7edc983c1830 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 9 Oct 2010 03:27:47 -0700 Subject: Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett --- linden/indra/newview/llfirstuse.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'linden/indra/newview/llfirstuse.cpp') diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp index e82aa96..0b777ea 100644 --- a/linden/indra/newview/llfirstuse.cpp +++ b/linden/indra/newview/llfirstuse.cpp @@ -328,21 +328,6 @@ void LLFirstUse::showRlvFirstUseNotification(const std::string& strName) } } -void LLFirstUse::warnRlvGiveToRLV() -{ - if ( (gSavedSettings.getWarning(RLV_SETTING_FIRSTUSE_GIVETORLV)) && (RlvSettings::getForbidGiveToRLV()) ) - LLNotifications::instance().add(RLV_SETTING_FIRSTUSE_GIVETORLV, LLSD(), LLSD(), &LLFirstUse::onRlvGiveToRLVConfirmation); -} - -void LLFirstUse::onRlvGiveToRLVConfirmation(const LLSD& notification, const LLSD& response) -{ - gSavedSettings.setWarning(RLV_SETTING_FIRSTUSE_GIVETORLV, FALSE); - - S32 idxOption = LLNotification::getSelectedOption(notification, response); - if ( (0 == idxOption) || (1 == idxOption) ) - gSavedSettings.setBOOL(RLV_SETTING_FORBIDGIVETORLV, (idxOption == 1)); -} - // [/RLVa:KB] void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& response) -- cgit v1.1 From b0446b980cc30d01644ef16f3775372109b612e3 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 3 Nov 2010 17:58:09 +0100 Subject: Rename hippo* files to lower case (PART 2 OF 2) There was a problem with #include "hippolimits.h" because the file is called hippoLimits.h (with an uppercase L). After some discussion on IRC it was reluctantly decided that filenames should be lowercase, as is done for every Linden file. This is part 2 or 2 (the first part just renamed the files). This part changes all files to make the viewer compile again after the renaming. --- linden/indra/newview/llfirstuse.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden/indra/newview/llfirstuse.cpp') diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp index 0b777ea..18efa9e 100644 --- a/linden/indra/newview/llfirstuse.cpp +++ b/linden/indra/newview/llfirstuse.cpp @@ -47,7 +47,7 @@ #include "floatergriddefault.h" #include "floatervoicelicense.h" -#include "hippoGridManager.h" +#include "hippogridmanager.h" #include "llstartup.h" #include "llvoavatar.h" -- cgit v1.1 From 282cb19508dcd38039454dfe71d23bb042fe376c Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Thu, 20 Jan 2011 14:24:11 +0100 Subject: re-enable statistics packet for SL, firstuse warn about it --- linden/indra/newview/llfirstuse.cpp | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'linden/indra/newview/llfirstuse.cpp') diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp index 18efa9e..f482d1c 100644 --- a/linden/indra/newview/llfirstuse.cpp +++ b/linden/indra/newview/llfirstuse.cpp @@ -390,3 +390,31 @@ void LLFirstUse::voiceLicenseAgreement() LLStartUp::setStartupState(STATE_LOGIN_AUTH_INIT); } } + +void LLFirstUse::callbackPrivacy(const LLSD& notification, const LLSD& response) +{ + + S32 option = LLNotification::getSelectedOption(notification, response); + if ( 0 == option ) + { + gSavedSettings.setWarning("FirstPrivacy", FALSE); + LLStartUp::setStartupState(STATE_PRIVACY_LECTURED); + } + if ( 1 == option ) + { + LLStartUp::resetLogin(); + } +} + +// static +void LLFirstUse::Privacy() +{ + if (gSavedSettings.getWarning("FirstPrivacy")) + { + LLNotifications::instance().add("FirstPrivacy", LLSD(), LLSD(), callbackPrivacy); + } + else + { + LLStartUp::setStartupState(STATE_PRIVACY_LECTURED); + } +} \ No newline at end of file -- cgit v1.1