Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 48 insertions, 0 deletions

diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index 9ee24d6..513cba3 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -45,6 +45,10 @@
 #include "llappviewer.h"
 #include "lltracker.h"
 
+// [RLVa:KB] - Version: 1.22.11
+#include "llviewerwindow.h"
+// [/RLVa:KB]
+
 // static
 std::set<std::string> LLFirstUse::sConfigVariables;
 
@@ -132,6 +136,17 @@ void LLFirstUse::useMap()
 }
 
 // static
+void LLFirstUse::useMiniMap()
+{
+        if (gSavedSettings.getWarning("FirstMiniMap"))
+        {
+                gSavedSettings.setWarning("FirstMiniMap", FALSE);
+
+                LLNotifyBox::showXml("FirstMiniMap");
+        }
+}
+
+// static
 void LLFirstUse::useGoTo()
 {
         // nothing for now JC
@@ -277,3 +292,36 @@ void LLFirstUse::useMedia()
                 LLNotifications::instance().add("FirstMedia");
         }
 }
+
+// [RLVa:KB] - Version: 1.22.11 | Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a
+
+// SL-1.22.11 doesn't seem to have a way to check which notifications are currently open :(
+bool rlvHasVisibleFirstUseNotification()
+{
+        return false;
+}
+
+void LLFirstUse::showRlvFirstUseNotification(const std::string& strName)
+{
+        if ( (gSavedSettings.getWarning(strName)) && (!rlvHasVisibleFirstUseNotification()) )
+        {
+                gSavedSettings.setWarning(strName, FALSE);
+                LLNotifyBox::showXml(strName);
+        }
+}
+
+void LLFirstUse::warnRlvGiveToRLV()
+{
+        if ( (gSavedSettings.getWarning(RLV_SETTING_FIRSTUSE_GIVETORLV)) && (RlvSettings::getForbidGiveToRLV()) )
+                gViewerWindow->alertXml(RLV_SETTING_FIRSTUSE_GIVETORLV, LLStringUtil::format_map_t(), &LLFirstUse::onRlvGiveToRLVConfirmation, NULL);
+}
+
+void LLFirstUse::onRlvGiveToRLVConfirmation(S32 idxOption, void* /*pUserParam*/)
+{
+        gSavedSettings.setWarning(RLV_SETTING_FIRSTUSE_GIVETORLV, FALSE);
+
+        if ( (0 == idxOption) || (1 == idxOption) )
+                gSavedSettings.setBOOL(RLV_SETTING_FORBIDGIVETORLV, (idxOption == 1));
+}
+
+// [/RLVa:KB]