Merged Experimental branch (exp) back into main line (next).

Git thought many files (almost 100) had merge conflicts. But, after
resolving the conflicts (which were mostly trivial), almost all the
files turned out to be the same as in the exp branch. So, the
conflicts are not listed here. Check the diff between commit 244ffe8
and this commit to see what really changed.

1 files changed, 1 insertions, 16 deletions

diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index a15b912..c6f8356 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"
 
@@ -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)