diff options
Diffstat (limited to 'indra/llui/lltoolbarview.h')
| -rw-r--r-- | indra/llui/lltoolbarview.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltoolbarview.h b/indra/llui/lltoolbarview.h index dd2bbf0e49..20525a22ac 100644 --- a/indra/llui/lltoolbarview.h +++ b/indra/llui/lltoolbarview.h @@ -50,6 +50,7 @@ public: // the user folder for the user specific (saved) settings struct Toolbar : public LLInitParam::Block<Toolbar> { + Mandatory<U32> button_display_mode; Multiple<LLCommandId::Params> commands; Toolbar(); }; @@ -69,7 +70,9 @@ public: // 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 + bool loadToolbars(bool force_default = false); // return false if load fails + + static bool loadDefaultToolbars(); protected: friend class LLUICtrlFactory; |