diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-03 17:13:14 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-03 17:13:14 -0700 |
| commit | 99ada9b047d1cda8f45ec7f193ec04328496a721 (patch) | |
| tree | 03daf2f4ab56de43b03f4f7b0963abe041ad67ec /indra/newview/lltoolbarview.cpp | |
| parent | cd467cc34f876920b35d3570f50dbad54ce4a42c (diff) | |
| parent | 37fdd27bcbd38b5cf22e0ff003f4d01b908996c7 (diff) | |
EXP-1202 : pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/lltoolbarview.cpp')
| -rw-r--r-- | indra/newview/lltoolbarview.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index 929486a185..5822f682df 100644 --- a/indra/newview/lltoolbarview.cpp +++ b/indra/newview/lltoolbarview.cpp @@ -129,7 +129,7 @@ bool LLToolBarView::addCommand(const LLCommandId& command, LLToolBar* toolbar) } bool LLToolBarView::loadToolbars(bool force_default) -{ +{ LLToolBarView::ToolbarSet toolbar_set; // Load the toolbars.xml file @@ -219,6 +219,19 @@ bool LLToolBarView::loadToolbars(bool force_default) return true; } +//static +bool LLToolBarView::loadDefaultToolbars() +{ + bool retval = false; + + if (gToolBarView) + { + retval = gToolBarView->loadToolbars(true); + } + + return retval; +} + void LLToolBarView::saveToolbars() const { // Build the parameter tree from the toolbar data |