diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
commit | d5cceb9d2f05ba4e19da3cc50ef273aa4dffc453 (patch) | |
tree | de0a6cf70ec27964f2b08040c9f217114bd49fa4 /indra/newview/llfloaterbulkpermission.h | |
parent | c4817c4e5856577ff56f34ba48e12cef5ee7ab6d (diff) | |
parent | 71dc13aac99458989776e93c38294f507074fce4 (diff) |
Almost automated merge
Diffstat (limited to 'indra/newview/llfloaterbulkpermission.h')
-rw-r--r-- | indra/newview/llfloaterbulkpermission.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h index c34e4413cc..31f4f5c3e1 100644 --- a/indra/newview/llfloaterbulkpermission.h +++ b/indra/newview/llfloaterbulkpermission.h @@ -79,7 +79,6 @@ private: U8 key, bool is_new); -// static void onHelpBtn(void* user_data); void onCloseBtn(); void onApplyBtn(); void onCommitCopy(); |