summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolbarview.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-11-07 11:15:40 -0800
committerRichard Linden <none@none>2011-11-07 11:15:40 -0800
commit32dca99fe59196fa4a92a815b441b4e6e9f747f0 (patch)
tree6a257d591ad0f241c7fbd42acca72ea79e4c9cf6 /indra/newview/lltoolbarview.h
parent8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff)
parentd6d4bfa02a46c5c7f2e5376b9fad79f2624dda83 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/lltoolbarview.h')
-rw-r--r--indra/newview/lltoolbarview.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index 4307d10258..b99e8bc28d 100644
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -94,9 +94,13 @@ public:
// Loads the toolbars from the existing user or default settings
bool loadToolbars(bool force_default = false); // return false if load fails
+ // Clears all buttons off the toolbars
+ bool clearToolbars();
+
void setToolBarsVisible(bool visible);
static bool loadDefaultToolbars();
+ static bool clearAllToolbars();
static void startDragTool(S32 x, S32 y, LLToolBarButton* toolbarButton);
static BOOL handleDragTool(S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type);