From 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Fri, 22 May 2009 09:58:47 +0000
Subject: svn merge -r121194:121210
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
---
 indra/newview/llfloaterbulkpermission.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index 09af27045a..a26b5b4f79 100644
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -76,6 +76,7 @@ private:
 								U8 key,
 								bool is_new);
 
+	static void onHelpBtn(void* user_data);
 	static void onCloseBtn(void* user_data);
 	static void onApplyBtn(void* user_data);
 	static void onCommitCopy(LLUICtrl* ctrl, void* data);
-- 
cgit v1.2.3