diff -r 4d9106153407 doc/contributions.txt --- a/doc/contributions.txt Thu Jun 21 16:44:04 2012 -0400 +++ b/doc/contributions.txt Sat Jun 23 19:27:56 2012 -0400 @@ -629,6 +629,7 @@ STORM-1809 STORM-1793 STORM-1810 + STORM-1892 Kadah Coba STORM-1060 Jondan Lundquist diff -r 4d9106153407 indra/newview/llfloaterbulkpermission.h --- a/indra/newview/llfloaterbulkpermission.h Thu Jun 21 16:44:04 2012 -0400 +++ b/indra/newview/llfloaterbulkpermission.h Sat Jun 23 19:27:56 2012 -0400 @@ -72,6 +72,7 @@ bool is_new); void onCloseBtn(); + void onOkBtn(); void onApplyBtn(); void onCommitCopy(); void onCheckAll() { doCheckUncheckAll(TRUE); } diff -r 4d9106153407 indra/newview/llfloaterbulkpermission.cpp --- a/indra/newview/llfloaterbulkpermission.cpp Thu Jun 21 16:44:04 2012 -0400 +++ b/indra/newview/llfloaterbulkpermission.cpp Sat Jun 23 19:27:56 2012 -0400 @@ -57,6 +57,7 @@ mDone(FALSE) { mID.generate(); + mCommitCallbackRegistrar.add("BulkPermission.Ok", boost::bind(&LLFloaterBulkPermission::onOkBtn, this)); mCommitCallbackRegistrar.add("BulkPermission.Apply", boost::bind(&LLFloaterBulkPermission::onApplyBtn, this)); mCommitCallbackRegistrar.add("BulkPermission.Close", boost::bind(&LLFloaterBulkPermission::onCloseBtn, this)); mCommitCallbackRegistrar.add("BulkPermission.CheckAll", boost::bind(&LLFloaterBulkPermission::onCheckAll, this)); @@ -144,6 +145,12 @@ } } +void LLFloaterBulkPermission::onOkBtn() +{ + doApply(); + closeFloater(); +} + void LLFloaterBulkPermission::onApplyBtn() { doApply(); diff -r 4d9106153407 indra/newview/skins/default/xui/en/floater_bulk_perms.xml --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml Thu Jun 21 16:44:04 2012 -0400 +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml Sat Jun 23 19:27:56 2012 -0400 @@ -6,7 +6,7 @@ layout="topleft" name="floaterbulkperms" help_topic="floaterbulkperms" - title="EDIT CONTENT PERMISSIONS" + title="ADJUST CONTENT PERMISSIONS" width="410"> @@ -192,7 +192,7 @@ name="newperms" top="90" width="250"> - New Content Permissions + Adjust Content Permissions To + + +