summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterbulkpermission.h
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2009-05-22 09:58:47 +0000
committerAdam Moss <moss@lindenlab.com>2009-05-22 09:58:47 +0000
commit9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 (patch)
tree3136e0a32cdcb1d55a4c3a5a67791ca128d947a5 /indra/newview/llfloaterbulkpermission.h
parent93cf3d89e51835dd2f61c32b16191ab724528055 (diff)
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
Diffstat (limited to 'indra/newview/llfloaterbulkpermission.h')
-rw-r--r--indra/newview/llfloaterbulkpermission.h1
1 files changed, 1 insertions, 0 deletions
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);