From 667ca55bad0108c4bdf8f007b89e1a52fc766aad Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Mon, 5 Jan 2009 18:59:12 +0000
Subject: svn merge -r106715:HEAD
 svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715
 .  QAR-1149 -- Final merge of notifications to trunk.

---
 indra/newview/llfloaterpostcard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterpostcard.h')

diff --git a/indra/newview/llfloaterpostcard.h b/indra/newview/llfloaterpostcard.h
index 28248f65df..94c619c7e5 100644
--- a/indra/newview/llfloaterpostcard.h
+++ b/indra/newview/llfloaterpostcard.h
@@ -65,7 +65,7 @@ public:
 	static void updateUserInfo(const std::string& email);
 
 	static void onMsgFormFocusRecieved(LLFocusableElement* receiver, void* data);
-	static void missingSubjMsgAlertCallback(S32 option, void* data);
+	bool missingSubjMsgAlertCallback(const LLSD& notification, const LLSD& response);
 
 	void sendPostcard();
 
-- 
cgit v1.2.3