diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-28 16:23:04 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-28 16:23:04 -0700 |
| commit | 21543fdf26e8104d00bd683bdff5185d6dd620ef (patch) | |
| tree | e4ef0a2be82e16a6ac50c7eb87cd29b2afb2934e /indra/llui/lltoolbarview.h | |
| parent | 15f3ea39d7deb0c956b56703a94f6d072b7f2d21 (diff) | |
EXP-1257 : Implemented loading of toolbar settings per user account. Also factorize a bit and clean up the related saveToolbars code.
Diffstat (limited to 'indra/llui/lltoolbarview.h')
| -rw-r--r-- | indra/llui/lltoolbarview.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/lltoolbarview.h b/indra/llui/lltoolbarview.h index 646a1fd636..b19841997b 100644 --- a/indra/llui/lltoolbarview.h +++ b/indra/llui/lltoolbarview.h @@ -67,7 +67,10 @@ public: virtual void draw(); // Toolbar view interface with the rest of the world + // Checks if the commandId is being used somewhere in one of the toolbars bool hasCommand(const LLCommandId& commandId) const; + // Loads the toolbars from the existing user or default settings + bool loadToolbars(); // return false if load fails protected: friend class LLUICtrlFactory; @@ -76,10 +79,9 @@ protected: void initFromParams(const Params&); private: - // Loads the toolbars from the existing user or default settings - bool loadToolbars(); // return false if load fails void saveToolbars() const; bool addCommand(const LLCommandId& commandId, LLToolBar* toolbar); + void addToToolset(command_id_list_t& command_list, Toolbar& toolbar) const; // Pointers to the toolbars handled by the toolbar view LLToolBar* mToolbarLeft; |