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/llviewertexteditor.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h
index 7ce28fc60a..2e1c0f1d86 100644
--- a/indra/newview/llviewertexteditor.h
+++ b/indra/newview/llviewertexteditor.h
@@ -113,8 +113,8 @@ private:
 	void			showCopyToInvDialog( LLInventoryItem* item );
 	void			showUnsavedAlertDialog( LLInventoryItem* item );
 
-	static void		onCopyToInvDialog( S32 option, void* userdata );
-	static void		onNotecardDialog( S32 option, void* userdata );
+	bool			onCopyToInvDialog(const LLSD& notification, const LLSD& response );
+	static bool		onNotecardDialog(const LLSD& notification, const LLSD& response );
 	
 	LLPointer<LLInventoryItem> mDragItem;
 	BOOL mDragItemSaved;
-- 
cgit v1.2.3