Sync with upstream, improve RLVa and make use of the callback registrar

indra/newview/llfloaternotificationsconsole.h

@@ -35,7 +35,9 @@
 
 #include "llfloater.h"
 #include "lllayoutstack.h"
-#include "llnotifications.h"
+//#include "llnotificationsutil.h"
+
+class LLNotification;
 
 class LLFloaterNotificationConsole : 
 	public LLFloater, 
@@ -55,7 +57,7 @@ public:
 	void updateResizeLimits();
 
 private:
-	static void onClickAdd(void* user_data);
+	void onClickAdd();
 };