diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-19 19:44:30 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-19 19:44:30 -0700 |
| commit | aa3f5edc83a6a20f0473fff6f28fdad6f5406dc2 (patch) | |
| tree | 192da0c80b9b9b76486c2b174297b9dfd8f8b7de /indra/newview/llfloatertoybox.cpp | |
| parent | c8499a7b607171507df8cbb6f415dfaa66699b2a (diff) | |
| parent | 832a509c38035447ece2d0ae77c8661311e72d7e (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llfloatertoybox.cpp')
| -rw-r--r-- | indra/newview/llfloatertoybox.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloatertoybox.cpp b/indra/newview/llfloatertoybox.cpp index b4c9894271..66f644748e 100644 --- a/indra/newview/llfloatertoybox.cpp +++ b/indra/newview/llfloatertoybox.cpp @@ -39,7 +39,6 @@ LLFloaterToybox::LLFloaterToybox(const LLSD& key) : LLFloater(key) - , mBtnRestoreDefaults(NULL) , mToolBar(NULL) { mCommitCallbackRegistrar.add("Toybox.RestoreDefaults", boost::bind(&LLFloaterToybox::onBtnRestoreDefaults, this)); @@ -59,20 +58,19 @@ bool compare_localized_command_labels(LLCommand * cmd1, LLCommand * cmd2) BOOL LLFloaterToybox::postBuild() { - mBtnRestoreDefaults = getChild<LLButton>("btn_restore_defaults"); mToolBar = getChild<LLToolBar>("toybox_toolbar"); + mToolBar->setStartDragCallback(boost::bind(LLToolBarView::startDragTool,_1,_2,_3)); mToolBar->setHandleDragCallback(boost::bind(LLToolBarView::handleDragTool,_1,_2,_3,_4)); mToolBar->setHandleDropCallback(boost::bind(LLToolBarView::handleDropTool,_1,_2,_3,_4)); - LLCommandManager& cmdMgr = LLCommandManager::instance(); - // // Sort commands by localized labels so they will appear alphabetized in all languages // std::list<LLCommand *> alphabetized_commands; + LLCommandManager& cmdMgr = LLCommandManager::instance(); for (U32 i = 0; i < cmdMgr.commandCount(); i++) { LLCommand * command = cmdMgr.getCommand(i); |