diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-30 15:25:02 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-30 15:25:02 -0700 |
| commit | cdc80b1dd34ef533d7500bf1ab89abf3c5d81bb3 (patch) | |
| tree | f97716f2fcf1f2c0116a6efdf03b6d0feefcd21b /indra/newview | |
| parent | ccd619013d851b5a63976205ea06002e92d7f468 (diff) | |
EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1268 FIX -- The "Restore Defaults" button should reset the left/right/bottom toolbars to their default states
* LLToolBarView::loadDefaultToolbars now a static function
* Toybox button callback hooked up to properly restore defaults
Reviewed by Merov
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatertoybox.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatertoybox.cpp b/indra/newview/llfloatertoybox.cpp index d7f114043d..7a6afb4e33 100644 --- a/indra/newview/llfloatertoybox.cpp +++ b/indra/newview/llfloatertoybox.cpp @@ -61,6 +61,8 @@ BOOL LLFloaterToybox::postBuild() center(); mBtnRestoreDefaults = getChild<LLButton>("btn_restore_defaults"); + mBtnRestoreDefaults->setCommitCallback(boost::bind(&LLToolBarView::loadDefaultToolbars)); + mToolBar = getChild<LLToolBar>("toybox_toolbar"); LLCommandManager& cmdMgr = LLCommandManager::instance(); |