diff options
author | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
---|---|---|
committer | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
commit | 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 (patch) | |
tree | 3136e0a32cdcb1d55a4c3a5a67791ca128d947a5 /indra/newview/llfloaterbulkpermission.cpp | |
parent | 93cf3d89e51835dd2f61c32b16191ab724528055 (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.cpp')
-rw-r--r-- | indra/newview/llfloaterbulkpermission.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp index 4697296e16..d4e1e98125 100644 --- a/indra/newview/llfloaterbulkpermission.cpp +++ b/indra/newview/llfloaterbulkpermission.cpp @@ -61,6 +61,7 @@ LLFloaterBulkPermission::LLFloaterBulkPermission(const LLSD& seed) : mDone(FALSE mID.generate(); LLUICtrlFactory::getInstance()->buildFloater(this,"floater_bulk_perms.xml"); childSetEnabled("next_owner_transfer", gSavedSettings.getBOOL("BulkChangeNextOwnerCopy")); + childSetAction("help", onHelpBtn, this); childSetAction("apply", onApplyBtn, this); childSetAction("close", onCloseBtn, this); childSetAction("check_all", onCheckAll, this); @@ -149,6 +150,11 @@ void LLFloaterBulkPermission::onApplyBtn(void* user_data) self->doApply(); } +void LLFloaterBulkPermission::onHelpBtn(void* user_data) +{ + LLNotifications::instance().add("HelpBulkPermission"); +} + void LLFloaterBulkPermission::onCloseBtn(void* user_data) { LLFloaterBulkPermission* self = static_cast<LLFloaterBulkPermission*>(user_data); |