summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolbarview.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lltoolbarview.h')
-rw-r--r--indra/newview/lltoolbarview.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index 3d488f837f..414fcd8751 100644
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -50,7 +50,7 @@ public:
// the user folder for the user specific (saved) settings
struct Toolbar : public LLInitParam::Block<Toolbar>
{
- Mandatory<U32> button_display_mode;
+ Mandatory<LLToolBarEnums::ButtonType> button_display_mode;
Multiple<LLCommandId::Params> commands;
Toolbar();
};
@@ -73,7 +73,7 @@ public:
bool loadToolbars(bool force_default = false); // return false if load fails
static bool loadDefaultToolbars();
-
+
static void startDragItem( S32 x, S32 y, const LLUUID& uuid);
static BOOL handleDragItem( S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type);
static BOOL handleDrop( void* cargo_data, S32 x, S32 y, LLToolBar* toolbar);