Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 18 insertions, 0 deletions

diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index bb64cdd..3305ffe 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -36,6 +36,10 @@
 #include <vector>
 #include "llstring.h"
 
+// [RLVa:KB]
+#include "rlvdefines.h"
+// [/RLVa:KB]
+
 /*
 1.  On first use of 'sit here', explain how to get up and rotate view. 
 
@@ -93,6 +97,7 @@ public:
         static void useBalanceDecrease(S32 delta);
         static void useSit();
         static void useMap();
+        static void useMiniMap();
         static void useGoTo();
         static void useBuild();
         static void useLeftClickNoHit();
@@ -109,6 +114,19 @@ public:
         
 protected:
         static std::set<std::string> sConfigVariables;
+
+// [RLVa:KB] - Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a
+public:
+        static void showRlvFirstUseNotification(const std::string& strName);
+
+        static void useRlvDetach()              { showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_DETACH); }
+        static void useRlvEnableWear()  { showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_ENABLEWEAR); }
+        static void useRlvFartouch()    { showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_FARTOUCH); }
+
+        static void warnRlvGiveToRLV();
+protected:
+        static void onRlvGiveToRLVConfirmation(S32 idxOption, void* pUserParam);
+// [/RLVa:KB]
 };
 
 #endif