Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e

1 files changed, 37 insertions, 4 deletions

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<std::string> 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);