diff options
author | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:59:50 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:59:50 -0500 |
commit | 6b516b7a6c4a59ebd3bf9e84075bb4539be072e4 (patch) | |
tree | f910bb425c05a74eb2f7df0eab050de4d648ac20 /indra/newview/lltoolbarview.cpp | |
parent | 89b75e75315592da9f4aac2ed851b61f1ac20851 (diff) | |
parent | 32dca99fe59196fa4a92a815b441b4e6e9f747f0 (diff) |
merge changes for vmrg-182
Diffstat (limited to 'indra/newview/lltoolbarview.cpp')
-rw-r--r-- | indra/newview/lltoolbarview.cpp | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index ed1dfbb8cd..5ff0ccfeb2 100644 --- a/indra/newview/lltoolbarview.cpp +++ b/indra/newview/lltoolbarview.cpp @@ -315,6 +315,19 @@ bool LLToolBarView::loadToolbars(bool force_default) return true; } +bool LLToolBarView::clearToolbars() +{ + for (S32 i = TOOLBAR_FIRST; i <= TOOLBAR_LAST; i++) + { + if (mToolbars[i]) + { + mToolbars[i]->clearCommandsList(); + } + } + + return true; +} + //static bool LLToolBarView::loadDefaultToolbars() { @@ -332,6 +345,23 @@ bool LLToolBarView::loadDefaultToolbars() return retval; } +//static +bool LLToolBarView::clearAllToolbars() +{ + bool retval = false; + + if (gToolBarView) + { + retval = gToolBarView->clearToolbars(); + if (retval) + { + gToolBarView->saveToolbars(); + } + } + + return retval; +} + void LLToolBarView::saveToolbars() const { if (!mToolbarsLoaded) |