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/llui/lltoolbarview.h | |
| 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/llui/lltoolbarview.h')
| -rw-r--r-- | indra/llui/lltoolbarview.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltoolbarview.h b/indra/llui/lltoolbarview.h index efe6920db8..95c09ece73 100644 --- a/indra/llui/lltoolbarview.h +++ b/indra/llui/lltoolbarview.h @@ -72,7 +72,8 @@ public: bool hasCommand(const LLCommandId& commandId) const; // Loads the toolbars from the existing user or default settings bool loadToolbars(bool force_default = false); // return false if load fails - bool loadDefaultToolbars() { return loadToolbars(true); } + + static bool loadDefaultToolbars(); protected: friend class LLUICtrlFactory; |